Merge pull request #16 from sergeykhliustin/update/snapshot_tests

Updated snapshot tests
sergiikhliustin · Jan 24, 2023 · 961a9ab · 961a9ab
2 parents 6d4e396 + c80a85e
commit 961a9ab
Show file tree

Hide file tree

Showing 32 changed files with 18 additions and 7 deletions.
diff --git a/Buildio.xcodeproj/project.pbxproj b/Buildio.xcodeproj/project.pbxproj
@@ -248,7 +248,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastSwiftUpdateCheck = 1410;
+				LastSwiftUpdateCheck = 1420;
 				LastUpgradeCheck = 1400;
 				TargetAttributes = {
 					3F4E0353293D290800AB0322 = {

diff --git a/...ccountsScreenTests/testSnapshotDark.1.png → ...ntsScreenTests/ios_testSnapshotDark.1.png b/...ccountsScreenTests/testSnapshotDark.1.png → ...ntsScreenTests/ios_testSnapshotDark.1.png
diff --git a/...countsScreenTests/testSnapshotLight.1.png → ...tsScreenTests/ios_testSnapshotLight.1.png b/...countsScreenTests/testSnapshotLight.1.png → ...tsScreenTests/ios_testSnapshotLight.1.png
diff --git a/...ivitiesScreenTests/testSnapshotDark.1.png → ...iesScreenTests/ios_testSnapshotDark.1.png b/...ivitiesScreenTests/testSnapshotDark.1.png → ...iesScreenTests/ios_testSnapshotDark.1.png
diff --git a/...vitiesScreenTests/testSnapshotLight.1.png → ...esScreenTests/ios_testSnapshotLight.1.png b/...vitiesScreenTests/testSnapshotLight.1.png → ...esScreenTests/ios_testSnapshotLight.1.png
diff --git a/...__/AppsScreenTests/testSnapshotDark.1.png → ...ppsScreenTests/ios_testSnapshotDark.1.png b/...__/AppsScreenTests/testSnapshotDark.1.png → ...ppsScreenTests/ios_testSnapshotDark.1.png
diff --git a/..._/AppsScreenTests/testSnapshotLight.1.png → ...psScreenTests/ios_testSnapshotLight.1.png b/..._/AppsScreenTests/testSnapshotLight.1.png → ...psScreenTests/ios_testSnapshotLight.1.png
diff --git a/...tifactsScreenTests/testSnapshotDark.1.png → ...ctsScreenTests/ios_testSnapshotDark.1.png b/...tifactsScreenTests/testSnapshotDark.1.png → ...ctsScreenTests/ios_testSnapshotDark.1.png
diff --git a/...ifactsScreenTests/testSnapshotLight.1.png → ...tsScreenTests/ios_testSnapshotLight.1.png b/...ifactsScreenTests/testSnapshotLight.1.png → ...tsScreenTests/ios_testSnapshotLight.1.png
diff --git a/...ScreenTests/testAbortedSnapshotDark.1.png → ...enTests/ios_testAbortedSnapshotDark.1.png b/...ScreenTests/testAbortedSnapshotDark.1.png → ...enTests/ios_testAbortedSnapshotDark.1.png
diff --git a/...creenTests/testAbortedSnapshotLight.1.png → ...nTests/ios_testAbortedSnapshotLight.1.png b/...creenTests/testAbortedSnapshotLight.1.png → ...nTests/ios_testAbortedSnapshotLight.1.png
diff --git a/...dScreenTests/testFailedSnapshotDark.1.png → ...eenTests/ios_testFailedSnapshotDark.1.png b/...dScreenTests/testFailedSnapshotDark.1.png → ...eenTests/ios_testFailedSnapshotDark.1.png
diff --git a/...ScreenTests/testFailedSnapshotLight.1.png → ...enTests/ios_testFailedSnapshotLight.1.png b/...ScreenTests/testFailedSnapshotLight.1.png → ...enTests/ios_testFailedSnapshotLight.1.png
diff --git a/...ScreenTests/testSuccessSnapshotDark.1.png → ...enTests/ios_testSuccessSnapshotDark.1.png b/...ScreenTests/testSuccessSnapshotDark.1.png → ...enTests/ios_testSuccessSnapshotDark.1.png
diff --git a/...creenTests/testSuccessSnapshotLight.1.png → ...nTests/ios_testSuccessSnapshotLight.1.png b/...creenTests/testSuccessSnapshotLight.1.png → ...nTests/ios_testSuccessSnapshotLight.1.png
diff --git a/.../BuildsScreenTests/testSnapshotDark.1.png → ...ldsScreenTests/ios_testSnapshotDark.1.png b/.../BuildsScreenTests/testSnapshotDark.1.png → ...ldsScreenTests/ios_testSnapshotDark.1.png
diff --git a/...BuildsScreenTests/testSnapshotLight.1.png → ...dsScreenTests/ios_testSnapshotLight.1.png b/...BuildsScreenTests/testSnapshotLight.1.png → ...dsScreenTests/ios_testSnapshotLight.1.png
diff --git a/..._/LoginScreenTests/testSnapshotDark.1.png → ...ginScreenTests/ios_testSnapshotDark.1.png b/..._/LoginScreenTests/testSnapshotDark.1.png → ...ginScreenTests/ios_testSnapshotDark.1.png
diff --git a/.../LoginScreenTests/testSnapshotLight.1.png → ...inScreenTests/ios_testSnapshotLight.1.png b/.../LoginScreenTests/testSnapshotLight.1.png → ...inScreenTests/ios_testSnapshotLight.1.png
diff --git a/...__/LogsScreenTests/testSnapshotDark.1.png → ...ogsScreenTests/ios_testSnapshotDark.1.png b/...__/LogsScreenTests/testSnapshotDark.1.png → ...ogsScreenTests/ios_testSnapshotDark.1.png
diff --git a/..._/LogsScreenTests/testSnapshotLight.1.png → ...gsScreenTests/ios_testSnapshotLight.1.png b/..._/LogsScreenTests/testSnapshotLight.1.png → ...gsScreenTests/ios_testSnapshotLight.1.png
diff --git a/...ts/Sources/Screens/__Snapshots__/SettingsScreenTests/ios_testSnapshotDark.1.png b/...ts/Sources/Screens/__Snapshots__/SettingsScreenTests/ios_testSnapshotDark.1.png
diff --git a/...ttingsScreenTests/testSnapshotLight.1.png → ...gsScreenTests/ios_testSnapshotLight.1.png b/...ttingsScreenTests/testSnapshotLight.1.png → ...gsScreenTests/ios_testSnapshotLight.1.png
diff --git a/...ITests/Sources/Screens/__Snapshots__/SettingsScreenTests/testSnapshotDark.1.png b/...ITests/Sources/Screens/__Snapshots__/SettingsScreenTests/testSnapshotDark.1.png
diff --git a/...enTests/testAppSelectedSnapshotDark.1.png → ...sts/ios_testAppSelectedSnapshotDark.1.png b/...enTests/testAppSelectedSnapshotDark.1.png → ...sts/ios_testAppSelectedSnapshotDark.1.png
diff --git a/...nTests/testAppSelectedSnapshotLight.1.png → ...ts/ios_testAppSelectedSnapshotLight.1.png b/...nTests/testAppSelectedSnapshotLight.1.png → ...ts/ios_testAppSelectedSnapshotLight.1.png
diff --git a/...creenTests/testBranchesSnapshotDark.1.png → ...nTests/ios_testBranchesSnapshotDark.1.png b/...creenTests/testBranchesSnapshotDark.1.png → ...nTests/ios_testBranchesSnapshotDark.1.png
diff --git a/...reenTests/testBranchesSnapshotLight.1.png → ...Tests/ios_testBranchesSnapshotLight.1.png b/...reenTests/testBranchesSnapshotLight.1.png → ...Tests/ios_testBranchesSnapshotLight.1.png
diff --git a/...ScreenTests/testInitialSnapshotDark.1.png → ...enTests/ios_testInitialSnapshotDark.1.png b/...ScreenTests/testInitialSnapshotDark.1.png → ...enTests/ios_testInitialSnapshotDark.1.png
diff --git a/...creenTests/testInitialSnapshotLight.1.png → ...nTests/ios_testInitialSnapshotLight.1.png b/...creenTests/testInitialSnapshotLight.1.png → ...nTests/ios_testInitialSnapshotLight.1.png
diff --git a/BuildioUITests/Sources/Shared.swift b/BuildioUITests/Sources/Shared.swift
@@ -20,7 +20,9 @@ func appLight() -> XCUIApplication {
         "-AppleLocale",
         "en_US"
     ]
+    #if !targetEnvironment(macCatalyst)
     XCUIDevice.shared.orientation = .portrait
+    #endif
     app.launch()
     return app
 }
@@ -35,7 +37,9 @@ func appDark() -> XCUIApplication {
         "-AppleLocale",
         "en_US"
     ]
+    #if !targetEnvironment(macCatalyst)
     XCUIDevice.shared.orientation = .portrait
+    #endif
     app.launch()
     return app
 }
@@ -80,7 +84,8 @@ extension XCTActivity {
                         line: UInt = #line) {
         guard let image = app.windows.firstMatch.screenshot().image.removingBottomBar else { return }
         let view = UIImageView(image: image)
-        SnapshotTesting.assertSnapshot(matching: view, as: .image(perceptualPrecision: 0.92), file: file, testName: testName, line: line)
+        let name = (ProcessInfo.processInfo.isMacCatalystApp ? "mac_" : "ios_") + testName
+        SnapshotTesting.assertSnapshot(matching: view, as: .image(perceptualPrecision: 0.92), file: file, testName: name, line: line)
     }
 }
 

diff --git a/Modules/BuildioLogic/Sources/BuildioLogic/Managers/TokenManager.swift b/Modules/BuildioLogic/Sources/BuildioLogic/Managers/TokenManager.swift
@@ -73,12 +73,16 @@ public class TokenManager: ObservableObject {
 
     public init(_ account: String? = nil) {
         let keychain = Keychain()
-        self.tokens = keychain.allKeys().reduce([Token]()) { partialResult, key in
-            var result = partialResult
-            if let token = keychain[key] {
-                result.append(Token(token: token, email: key))
+        if ProcessInfo.processInfo.isTestEnv {
+            self.tokens = []
+        } else {
+            self.tokens = keychain.allKeys().reduce([Token]()) { partialResult, key in
+                var result = partialResult
+                if let token = keychain[key] {
+                    result.append(Token(token: token, email: key))
+                }
+                return result
             }
-            return result
         }
         self.keychain = keychain
         if let account = account {
@@ -108,6 +112,8 @@ public class TokenManager: ObservableObject {
     }
 
     fileprivate func saveTokens() {
+        guard !ProcessInfo.processInfo.isTestEnv else { return }
+
         do {
             try keychain.removeAll()
         } catch {