Merge pull request #114 from blyscuit/release/0.5.0

Release - 0.5.0
blyscuit · Jan 17, 2023 · 4a8ef39 · 4a8ef39
2 parents b2ed0ff + 9d74e66
commit 4a8ef39
Show file tree

Hide file tree

Showing 87 changed files with 2,643 additions and 154 deletions.
diff --git a/.github/workflows/ios_review_pull_request.yml b/.github/workflows/ios_review_pull_request.yml
@@ -101,6 +101,13 @@ jobs:
       - name: Build and Test
         run: bundle exec fastlane build_and_test
 
+      - name: Upload Failed Screenshots
+        uses: actions/upload-artifact@v3
+        with:
+          name: kif-failed-screenshots
+          path: iosApp/Failed_Screenshots
+          if-no-files-found: ignore
+
       - name: Run iOS Danger
         uses: MeilCli/danger-action@v5
         with:

diff --git a/.github/workflows/ios_sanity_full_test.yml b/.github/workflows/ios_sanity_full_test.yml
@@ -88,3 +88,10 @@ jobs:
 
       - name: Build and Test
         run: bundle exec fastlane build_and_full_test
+
+      - name: Upload Failed Screenshots
+        uses: actions/upload-artifact@v3
+        with:
+          name: kif-failed-screenshots
+          path: iosApp/Failed_Screenshots
+          if-no-files-found: ignore
diff --git a/.gitignore b/.gitignore
@@ -77,6 +77,10 @@ iosApp/fastlane/screenshots/**/*.png
 iosApp/fastlane/test_output
 iosApp/fastlane/xcov_output
 
+# Testing
+
+iosApp/Failed_Screenshots
+
 # Sourcery
 *.generated.swift
 

diff --git a/iosApp/CICDTests.xctestplan b/iosApp/CICDTests.xctestplan
@@ -9,6 +9,12 @@
     }
   ],
   "defaultOptions" : {
+    "environmentVariableEntries" : [
+      {
+        "key" : "KIF_SCREENSHOTS",
+        "value" : "$(PROJECT_DIR)\/Failed_Screenshots"
+      }
+    ],
     "targetForVariableExpansion" : {
       "containerPath" : "container:Survey.xcodeproj",
       "identifier" : "3AC192947DB2FAD63AFCCAEB",
@@ -24,6 +30,7 @@
       }
     },
     {
+      "enabled" : false,
       "skippedTests" : [
         "LoginSpec\/a_Login_screen__its_open__it_shows_its_ui_components()",
         "LoginSpec\/a_Login_screen__its_open__when_fill_in_invalid_credentials__shows_an_alert_after_the_request_fails()",
@@ -37,6 +44,13 @@
         "identifier" : "E7449C1BBC882ADE61DB38AC",
         "name" : "SurveyUITests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Survey.xcodeproj",
+        "identifier" : "09E6ABE32951CF3E007F1EE3",
+        "name" : "SurveyKIFUITests"
+      }
     }
   ],
   "version" : 1

diff --git a/iosApp/Dangerfile b/iosApp/Dangerfile
@@ -23,7 +23,10 @@ xcresultPath = "iosApp/#{Constants.TEST_OUTPUT_DIRECTORY_PATH}/#{Constants.TESTS
 changed_files = (git.modified_files - git.deleted_files) + git.added_files
 xcode_summary.ignored_results { |result|
   if result.location
-    not changed_files.include?(result.location.file_path)
+    ( 
+      not changed_files.include?(result.location.file_path) or
+      result.message.include?("AA_AppLoadSpec")
+    )
   else
     true
   end

diff --git a/iosApp/Podfile b/iosApp/Podfile
@@ -45,6 +45,13 @@ target 'Survey' do
   target 'SurveyUITests' do
     testing_pods
   end
+
+  target 'SurveyKIFUITests' do
+    inherit! :search_paths
+    testing_pods
+    pod 'KIF', :configurations => ['Debug Staging', 'Debug Production']
+    pod 'KIF/IdentifierTests', :configurations => ['Debug Staging', 'Debug Production']
+  end
 end
 
 post_install do |installer|

diff --git a/iosApp/Podfile.lock b/iosApp/Podfile.lock
@@ -42,6 +42,11 @@ PODS:
     - GoogleUtilities/Logger
   - IQKeyboardManagerSwift (6.5.10)
   - KeychainAccess (4.2.2)
+  - KIF (3.8.7):
+    - KIF/Core (= 3.8.7)
+  - KIF/Core (3.8.7)
+  - KIF/IdentifierTests (3.8.7):
+    - KIF/Core
   - Kingfisher (7.3.2)
   - KMPNativeCoroutinesCombine (0.12.6):
     - KMPNativeCoroutinesCore (= 0.12.6)
@@ -74,6 +79,8 @@ DEPENDENCIES:
   - FlowStacks
   - IQKeyboardManagerSwift
   - KeychainAccess
+  - KIF
+  - KIF/IdentifierTests
   - Kingfisher
   - KMPNativeCoroutinesCombine (= 0.12.6)
   - Nimble
@@ -102,6 +109,7 @@ SPEC REPOS:
     - GoogleUtilities
     - IQKeyboardManagerSwift
     - KeychainAccess
+    - KIF
     - Kingfisher
     - KMPNativeCoroutinesCombine
     - KMPNativeCoroutinesCore
@@ -143,6 +151,7 @@ SPEC CHECKSUMS:
   GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
   IQKeyboardManagerSwift: 52962c76ab33532f15ad9f3ff4e5715eda5335bb
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
+  KIF: 779cdbca106633b94ecee7b036537490ebdbd9de
   Kingfisher: 0086ad83719761ba9b2cdaf6ef4d5b4878cbae23
   KMPNativeCoroutinesCombine: 9c82dee7ba35c6acff4b35a9757bfecae8b335fd
   KMPNativeCoroutinesCore: 35da0312355f0e911cbb16923aea3389894affca
@@ -162,6 +171,6 @@ SPEC CHECKSUMS:
   SwiftLint: 32ee33ded0636d0905ef6911b2b67bbaeeedafa5
   Wormholy: 3252bc3e55a1847ef9a0976c1377bd77bf3635fa
 
-PODFILE CHECKSUM: 32a0ee8c609fe271e992af202bcfb555d3f95a90
+PODFILE CHECKSUM: 2873c5a20dd4993b442c59125176e7b756c7d323
 
 COCOAPODS: 1.11.3
diff --git a/iosApp/Survey.xcodeproj/project.pbxproj b/iosApp/Survey.xcodeproj/project.pbxproj
diff --git a/iosApp/Survey.xcodeproj/xcshareddata/xcschemes/Survey Staging Extended Tests.xcscheme b/iosApp/Survey.xcodeproj/xcshareddata/xcschemes/Survey Staging Extended Tests.xcscheme
@@ -39,6 +39,16 @@
                ReferencedContainer = "container:Survey.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09E6ABE32951CF3E007F1EE3"
+               BuildableName = "SurveyKIFUITests.xctest"
+               BlueprintName = "SurveyKIFUITests"
+               ReferencedContainer = "container:Survey.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference

diff --git a/iosApp/Survey.xcodeproj/xcshareddata/xcschemes/Survey Staging.xcscheme b/iosApp/Survey.xcodeproj/xcshareddata/xcschemes/Survey Staging.xcscheme
@@ -75,6 +75,17 @@
                </Test>
             </SkippedTests>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09E6ABE32951CF3E007F1EE3"
+               BuildableName = "SurveyKIFUITests.xctest"
+               BlueprintName = "SurveyKIFUITests"
+               ReferencedContainer = "container:Survey.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/iosApp/Survey.xcodeproj/xcshareddata/xcschemes/Survey.xcscheme b/iosApp/Survey.xcodeproj/xcshareddata/xcschemes/Survey.xcscheme
@@ -48,6 +48,17 @@
                ReferencedContainer = "container:Survey.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "09E6ABE32951CF3E007F1EE3"
+               BuildableName = "SurveyKIFUITests.xctest"
+               BlueprintName = "SurveyKIFUITests"
+               ReferencedContainer = "container:Survey.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/iosApp/Survey/Configurations/Plists/Info.plist b/iosApp/Survey/Configurations/Plists/Info.plist
@@ -48,5 +48,12 @@
 	<array>
 		<string>en</string>
 	</array>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict/>
+	</dict>
 </dict>
 </plist>
diff --git a/iosApp/Survey/Sources/Presentation/Coordinator/AppCoordinator.swift b/iosApp/Survey/Sources/Presentation/Coordinator/AppCoordinator.swift
@@ -11,7 +11,7 @@ import SwiftUI
 
 struct AppCoordinator: View {
 
-    @ObservedObject var coordinator = RouteCoordinator()
+    @StateObject var coordinator = RouteCoordinator()
 
     var body: some View {
         Router($coordinator.routes) { screen, _ in
@@ -23,7 +23,7 @@ struct AppCoordinator: View {
             case .splash:
                 SplashView(coordinator: coordinator)
             case .surveySelection:
-                SurveySelectionView()
+                SurveySelectionContainerView(coordinator: coordinator)
             }
         }
     }

diff --git a/iosApp/Survey/Sources/Presentation/Coordinator/RouteCoordinator.swift b/iosApp/Survey/Sources/Presentation/Coordinator/RouteCoordinator.swift
@@ -17,6 +17,10 @@ protocol BaseCoordinator {
 class RouteCoordinator: ObservableObject {
 
     @Published var routes: Routes<Screen> = [.root(.splash, embedInNavigationView: true)]
+
+    func showLogin() {
+        routes = [.root(.login, embedInNavigationView: true)]
+    }
 }
 
 extension RouteCoordinator: BaseCoordinator {
@@ -32,8 +36,8 @@ extension RouteCoordinator: BaseCoordinator {
 
 extension RouteCoordinator: SplashCoordinator {
 
-    func showLogin() {
-        routes = [.root(.login, embedInNavigationView: true)]
+    func showLoginFromSplash() {
+        showLogin()
     }
 }
 
@@ -47,3 +51,10 @@ extension RouteCoordinator: LoginCoordinator {
         routes = [.root(.surveySelection)]
     }
 }
+
+extension RouteCoordinator: AccountCoordinator {
+
+    func showLoginFromAccount() {
+        showLogin()
+    }
+}
diff --git a/iosApp/Survey/Sources/Presentation/Modules/Login/LoginView.swift b/iosApp/Survey/Sources/Presentation/Modules/Login/LoginView.swift
@@ -59,7 +59,6 @@ struct LoginView: View {
         .onTapGesture {
             hideKeyboard()
         }
-        .accessibilityElement(children: .contain)
         .hideBackButtonTitle()
         .onAppear {
             withAnimation(.easeIn(duration: animationDuration)) {

diff --git a/iosApp/Survey/Sources/Presentation/Modules/ResetPassword/ResetPassword+DataSource.swift b/iosApp/Survey/Sources/Presentation/Modules/ResetPassword/ResetPassword+DataSource.swift
@@ -40,7 +40,7 @@ extension ResetPasswordView {
                 }
                 .receive(on: DispatchQueue.main)
                 .sink { [weak self] value in
-                    guard let self = self else { return }
+                    guard let self else { return }
                     self.updateStates(value)
                     guard let notification = value.successNotification else { return }
                     self.scheduleNotification(notification)

diff --git a/iosApp/Survey/Sources/Presentation/Modules/Splash/SplashView+DataSource.swift b/iosApp/Survey/Sources/Presentation/Modules/Splash/SplashView+DataSource.swift
@@ -14,7 +14,7 @@ import SwiftUI
 // sourcery: AutoMockable
 protocol SplashCoordinator {
 
-    func showLogin()
+    func showLoginFromSplash()
     func showHome()
 }
 
@@ -43,7 +43,7 @@ extension SplashView {
                 }
                 .receive(on: DispatchQueue.main)
                 .sink { [weak self] value in
-                    guard let self = self else { return }
+                    guard let self else { return }
                     self.updateStates(value)
                 }
                 .store(in: &cancellables)
@@ -60,7 +60,7 @@ extension SplashView {
                 if viewState.isLogin {
                     coordinator.showHome()
                 } else {
-                    coordinator.showLogin()
+                    coordinator.showLoginFromSplash()
                 }
             }
         }