build: update tests scheme name to fix tests report format (SDKCF-5616)

imaginaris · web-flow · commit 10f43e44116b · 2022-09-05T00:51:26.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
           bundle exec pod install
           xcodebuild \
           -workspace RSDKUtils.xcworkspace \
-          -scheme Tests \
+          -scheme TestHost \
           -resultBundlePath artifacts/unit-tests/Tests \
           -destination "platform=iOS Simulator,name=iPhone 11" \
           test
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dangerfile b/Dangerfile
@@ -3,7 +3,7 @@ warn("Big PR") if git.lines_of_code > 500
 
 xcov.report(
   workspace: 'RSDKUtils.xcworkspace',
-  scheme: 'Tests',
+  scheme: 'TestHost',
   output_directory: 'artifacts/unit-tests/coverage',
   source_directory: 'Sources',
   json_report: true,
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,17 +1,17 @@
 PODS:
   - Nimble (9.2.1)
   - Quick (5.0.1)
-  - RSDKUtils (3.0.0):
-    - RSDKUtils/Main (= 3.0.0)
-  - RSDKUtils/Main (3.0.0):
+  - RSDKUtils (4.0.0):
+    - RSDKUtils/Main (= 4.0.0)
+  - RSDKUtils/Main (4.0.0):
     - RSDKUtils/RLogger
-  - RSDKUtils/Nimble (3.0.0):
+  - RSDKUtils/Nimble (4.0.0):
     - Nimble
     - RSDKUtils/Main
-  - RSDKUtils/RLogger (3.0.0)
-  - RSDKUtils/TestHelpers (3.0.0):
+  - RSDKUtils/RLogger (4.0.0)
+  - RSDKUtils/TestHelpers (4.0.0):
     - RSDKUtils/Main
-  - SwiftLint (0.47.0)
+  - SwiftLint (0.48.0)
 
 DEPENDENCIES:
   - Nimble
@@ -35,8 +35,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Nimble: e7e615c0335ee4bf5b0d786685451e62746117d5
   Quick: 749aa754fd1e7d984f2000fe051e18a3a9809179
-  RSDKUtils: 36d97c9a41b5663ba56e73c626d27034a6c317e5
-  SwiftLint: d41cc46a2ae58ac6d9f26954bc89f1d72e71fdef
+  RSDKUtils: e2a63eb729298706abe02e735436a2586c65e164
+  SwiftLint: 284cea64b6187c5d6bd83e9a548a64104d546447
 
 PODFILE CHECKSUM: 4ed9773263044cef845ee896ef054d609b9a1edc
 
diff --git a/RSDKUtils.xcodeproj/xcshareddata/xcschemes/TestHost.xcscheme b/RSDKUtils.xcodeproj/xcshareddata/xcschemes/TestHost.xcscheme
@@ -8,9 +8,9 @@
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "YES"
-            buildForArchiving = "YES"
+            buildForArchiving = "NO"
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:RSDKUtils.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D06A23ED24D4007300E84EE2"
+               BuildableName = "TestHost.app"
+               BlueprintName = "TestHost"
+               ReferencedContainer = "container:RSDKUtils.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
diff --git a/Tests/Tests/KeyStoreTests.swift b/Tests/Tests/KeyStoreTests.swift
@@ -8,6 +8,7 @@ import Nimble
 
 class KeyStoreSpec: QuickSpec {
     override func spec() {
+        #if !SWIFT_PACKAGE
         // Keychain can't be mocked so the best we can do
         // to isolate the tests is to use a separate
         // keychain service
@@ -66,5 +67,6 @@ class KeyStoreSpec: QuickSpec {
                 expect(keyStore.key(for: "key-id-4")).to(beNil())
             }
         }
+        #endif
     }
 }
diff --git a/fastlane/.env b/fastlane/.env
@@ -1,4 +1,4 @@
-REM_FL_TESTS_SCHEME=Tests
+REM_FL_TESTS_SCHEME=TestHost
 REM_FL_TESTS_DEVICE=iPhone 11
 REM_FL_TESTS_PROJECT=./RSDKUtils.xcodeproj
 REM_FL_TESTS_WORKSPACE=./RSDKUtils.xcworkspace
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -20,7 +20,7 @@ platform :ios do
       skip_build: true,
       output_directory: './artifacts/unit-tests',
       scheme: ENV['REM_FL_TESTS_SCHEME'] || 'Tests',
-      device: ENV['REM_FL_TESTS_DEVICE'] || 'REM SDK Unit Tests',
+      device: ENV['REM_FL_TESTS_DEVICE'] || 'iPhone 11',
       code_coverage: true,
       output_types: 'json-compilation-database,html,junit',
       output_files: 'compile_commands.json,report.html,report.junit')

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import Nimble`
`8`	`8`
`9`	`9`	`class KeyStoreSpec: QuickSpec {`
`10`	`10`	`override func spec() {`
	`11`	`+ #if !SWIFT_PACKAGE`
`11`	`12`	`// Keychain can't be mocked so the best we can do`
`12`	`13`	`// to isolate the tests is to use a separate`
`13`	`14`	`// keychain service`
`@@ -66,5 +67,6 @@ class KeyStoreSpec: QuickSpec {`
`66`	`67`	`expect(keyStore.key(for: "key-id-4")).to(beNil())`
`67`	`68`	`}`
`68`	`69`	`}`
	`70`	`+ #endif`
`69`	`71`	`}`
`70`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-REM_FL_TESTS_SCHEME=Tests`
	`1`	`+REM_FL_TESTS_SCHEME=TestHost`
`2`	`2`	`REM_FL_TESTS_DEVICE=iPhone 11`
`3`	`3`	`REM_FL_TESTS_PROJECT=./RSDKUtils.xcodeproj`
`4`	`4`	`REM_FL_TESTS_WORKSPACE=./RSDKUtils.xcworkspace`