Skip to content

Commit

Permalink
cocoapods-fix (#237)
Browse files Browse the repository at this point in the history
  • Loading branch information
barv-jfrog authored Nov 18, 2024
1 parent 7ac3ba8 commit a706636
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 532 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ jobs:
testFlags: '--test.audit.Go'
- name: 'C/C++/C# Suite (Conan, NuGet, Dotnet)'
testFlags: '--test.audit.C'
- name: 'Cocoapods Suite'
testFlags: '--test.audit.Cocoapods'

steps:
# Prepare the environment
Expand Down
3 changes: 2 additions & 1 deletion commands/audit/sca/cocoapods/cocoapods_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func TestBuildCocoapodsDependencyList(t *testing.T) {
techutils.Cocoapods.GetPackageTypeId() + "GoogleSignIn:6.2.4",
techutils.Cocoapods.GetPackageTypeId() + "GTMAppAuth:1.3.1",
techutils.Cocoapods.GetPackageTypeId() + "GTMSessionFetcher:2.3.0",
techutils.Cocoapods.GetPackageTypeId() + "nanopb:0.4.1",
techutils.Cocoapods.GetPackageTypeId() + packageInfo,
}

Expand All @@ -49,7 +50,7 @@ func TestBuildCocoapodsDependencyList(t *testing.T) {
assert.NotEmpty(t, rootNode)

assert.Equal(t, rootNode[0].Id, techutils.Cocoapods.GetPackageTypeId()+packageInfo)
assert.Len(t, rootNode[0].Nodes, 4)
assert.Len(t, rootNode[0].Nodes, 5)

child1 := tests.GetAndAssertNode(t, rootNode[0].Nodes, "GTMSessionFetcher:2.3.0")
assert.Len(t, child1.Nodes, 0)
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/projects/package-managers/cocoapods/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ target 'Test' do
pod 'GoogleSignIn', '~> 6.2.4'
pod 'AppAuth', '~> 1.7.5'
pod 'AppAuth', '~> 1.7.5'

pod 'nanopb', '~> 0.4.1'

end
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PODS:
- AppAuth/Core (~> 1.6)
- GTMSessionFetcher/Core (< 3.0, >= 1.5)
- GTMSessionFetcher/Core (2.3.0)

- nanopb (0.4.1)
DEPENDENCIES:
- GoogleSignIn

Expand Down
Loading

0 comments on commit a706636

Please sign in to comment.