fix: Fixing the WebAuthn integration tests (#3933)

aws-amplify · Dec 9, 2024 · 06207f4 · 06207f4
1 parent 69d0159
commit 06207f4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/integ_test_auth.yml b/.github/workflows/integ_test_auth.yml
@@ -22,6 +22,11 @@ on:
         required: true
         default: true
         type: boolean
+      webauthn-ios:
+        description: '🔐 WebAuthn iOS'
+        required: true
+        default: true
+        type: boolean
   workflow_call:
 
 permissions:
@@ -59,8 +64,8 @@ jobs:
       timeout-minutes: 30
     secrets: inherit
 
-  # Disabling the integration test because the job is not able to connect to the local server
-  # auth-webauthn-integration-test-iOS:
-  #   name: Auth WebAuthn Integration Tests (iOS)
-  #   uses: ./.github/workflows/integ_test_auth_webauthn.yml
-  #   secrets: inherit
+  auth-webauthn-integration-test-iOS:
+    if: ${{ inputs.webauthn-ios != 'false' }}
+    name: Auth WebAuthn Integration Tests (iOS)
+    uses: ./.github/workflows/integ_test_auth_webauthn.yml
+    secrets: inherit
diff --git a/...ifyPlugins/Auth/Tests/AuthWebAuthnApp/AuthWebAuthnAppUITests/AuthWebAuthnAppUITests.swift b/...ifyPlugins/Auth/Tests/AuthWebAuthnApp/AuthWebAuthnAppUITests/AuthWebAuthnAppUITests.swift
@@ -19,7 +19,9 @@ final class AuthWebAuthnAppUITests: XCTestCase {
     private var deleteButton: XCUIElement!
     private var deleteUserButton: XCUIElement!
     private var springboard: XCUIApplication!
-    private var continueButton: XCUIElement!
+    private var continueButton: XCUIElement! {
+        springboard.otherElements["ASAuthorizationControllerContinueButton"]
+    }
 
     private lazy var deviceIdentifier: String = {
         let paths = Bundle.main.bundleURL.pathComponents
@@ -57,7 +59,6 @@ final class AuthWebAuthnAppUITests: XCTestCase {
         signInButton = nil
         deleteButton = nil
         deleteUserButton = nil
-        continueButton = nil
         springboard = nil
         try await uninstallApp()
     }
@@ -233,9 +234,6 @@ final class AuthWebAuthnAppUITests: XCTestCase {
         signOutButton = app.buttons["SignOut"]
 
         springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")
-        // The Continue button only appears when a FaceID operation is triggered,
-        // so we're also not checking for its existance
-        continueButton = springboard.otherElements["ASAuthorizationControllerContinueButton"]
     }
 
     @MainActor

diff --git a/AmplifyPlugins/Auth/Tests/AuthWebAuthnApp/AuthWebAuthnAppUITests/LocalServer.swift b/AmplifyPlugins/Auth/Tests/AuthWebAuthnApp/AuthWebAuthnAppUITests/LocalServer.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 enum LocalServer {
-    static let endpoint = "http://127.0.0.1:9293"
+    static let endpoint = "http://127.0.0.1:9294"
 
     case boot(String)
     case enroll(String)

diff --git a/AmplifyPlugins/Auth/Tests/AuthWebAuthnApp/LocalServer/index.mjs b/AmplifyPlugins/Auth/Tests/AuthWebAuthnApp/LocalServer/index.mjs
@@ -72,6 +72,6 @@ app.post('/match', async (req, res) => {
     }
 })
 
-app.listen(9293, () => {
+app.listen(9294, () => {
     console.log("Simulator server started!")
 })