Fix tests after rebase

StanfordSpezi · Apr 22, 2024 · bdb41b6 · bdb41b6
1 parent 27036bf
commit bdb41b6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Sources/SpeziOnboarding/OnboardingFlow/OnboardingNavigationPath.swift b/Sources/SpeziOnboarding/OnboardingFlow/OnboardingNavigationPath.swift
@@ -222,8 +222,8 @@ public class OnboardingNavigationPath {
 
             guard self.onboardingSteps[onboardingStepIdentifier] == nil else {
                 preconditionFailure("""
-                    SpeziOnboarding: Duplicate Onboarding step of type `\(onboardingStepIdentifier.onboardingStepType)` identified.
-                    Ensure unique Onboarding view instances within the `OnboardingStack`!
+                    SpeziOnboarding: Duplicate Onboarding step identifier hash `\(onboardingStepIdentifier.identifierHash)` identified.
+                    Ensure unique Onboarding view identifiers within the `OnboardingStack`!
                     """)
             }
 

diff --git a/Tests/UITests/TestApp/OnboardingTestsView.swift b/Tests/UITests/TestApp/OnboardingTestsView.swift
@@ -25,9 +25,9 @@ struct OnboardingTestsView: View {
             OnboardingSequentialTestView()
             OnboardingConsentMarkdownTestView()
             OnboardingConsentMarkdownRenderingView()
-            OnboardingCustomToggleTestView(showConditionalView: $showConditionalView)
             OnboardingTestViewNotIdentifiable(text: "Leland").onboardingIdentifier("a")
             OnboardingTestViewNotIdentifiable(text: "Stanford").onboardingIdentifier("b")
+            OnboardingCustomToggleTestView(showConditionalView: $showConditionalView)
 
             if showConditionalView {
                 OnboardingConditionalTestView()

diff --git a/Tests/UITests/TestAppUITests/SpeziOnboardingTests.swift b/Tests/UITests/TestAppUITests/SpeziOnboardingTests.swift
@@ -81,6 +81,9 @@ final class OnboardingTests: XCTestCase { // swiftlint:disable:this type_body_le
         XCTAssert(app.buttons["Next"].waitForExistence(timeout: 2))
         app.buttons["Next"].tap()
 
+        XCTAssert(app.buttons["Next"].waitForExistence(timeout: 2))
+        app.buttons["Next"].tap()
+
         // Check if on final page
         XCTAssert(app.staticTexts["Onboarding complete"].waitForExistence(timeout: 2))
     }
@@ -408,6 +411,12 @@ final class OnboardingTests: XCTestCase { // swiftlint:disable:this type_body_le
         XCTAssert(app.buttons["Next"].waitForExistence(timeout: 2))
         app.buttons["Next"].tap()
 
+        XCTAssert(app.buttons["Next"].waitForExistence(timeout: 2))
+        app.buttons["Next"].tap()
+
+        XCTAssert(app.buttons["Next"].waitForExistence(timeout: 2))
+        app.buttons["Next"].tap()
+
         XCTAssert(app.buttons["Show Conditional View"].waitForExistence(timeout: 2))
         app.buttons["Show Conditional View"].tap()
 
@@ -456,6 +465,9 @@ final class OnboardingTests: XCTestCase { // swiftlint:disable:this type_body_le
         XCTAssert(app.buttons["Next"].waitForExistence(timeout: 2))
         app.buttons["Next"].tap()
 
+        XCTAssert(app.buttons["Next"].waitForExistence(timeout: 2))
+        app.buttons["Next"].tap()
+
         if showConditionalView {
             // Check if on conditional test view
             XCTAssert(app.staticTexts["Conditional Test View"].waitForExistence(timeout: 2))