Skip to content

Commit a706636

Browse files
authored
cocoapods-fix (jfrog#237)
1 parent 7ac3ba8 commit a706636

File tree

5 files changed

+6
-532
lines changed

5 files changed

+6
-532
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ jobs:
9797
testFlags: '--test.audit.Go'
9898
- name: 'C/C++/C# Suite (Conan, NuGet, Dotnet)'
9999
testFlags: '--test.audit.C'
100+
- name: 'Cocoapods Suite'
101+
testFlags: '--test.audit.Cocoapods'
100102

101103
steps:
102104
# Prepare the environment

commands/audit/sca/cocoapods/cocoapods_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ func TestBuildCocoapodsDependencyList(t *testing.T) {
3939
techutils.Cocoapods.GetPackageTypeId() + "GoogleSignIn:6.2.4",
4040
techutils.Cocoapods.GetPackageTypeId() + "GTMAppAuth:1.3.1",
4141
techutils.Cocoapods.GetPackageTypeId() + "GTMSessionFetcher:2.3.0",
42+
techutils.Cocoapods.GetPackageTypeId() + "nanopb:0.4.1",
4243
techutils.Cocoapods.GetPackageTypeId() + packageInfo,
4344
}
4445

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

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

5455
child1 := tests.GetAndAssertNode(t, rootNode[0].Nodes, "GTMSessionFetcher:2.3.0")
5556
assert.Len(t, child1.Nodes, 0)

tests/testdata/projects/package-managers/cocoapods/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ target 'Test' do
55
pod 'GoogleSignIn', '~> 6.2.4'
66
pod 'AppAuth', '~> 1.7.5'
77
pod 'AppAuth', '~> 1.7.5'
8-
8+
pod 'nanopb', '~> 0.4.1'
99

1010
end

tests/testdata/projects/package-managers/cocoapods/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PODS:
1313
- AppAuth/Core (~> 1.6)
1414
- GTMSessionFetcher/Core (< 3.0, >= 1.5)
1515
- GTMSessionFetcher/Core (2.3.0)
16-
16+
- nanopb (0.4.1)
1717
DEPENDENCIES:
1818
- GoogleSignIn
1919

0 commit comments

Comments
 (0)