From 78283aa73c64c43a31f11853360151e5ffdb8a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Coleksii-minaiev=E2=80=9D?= <“oleksii.minaiev@postindustria.com”> Date: Mon, 12 Aug 2024 15:19:54 +0300 Subject: [PATCH] Fixed await/async in tests --- demo/demo-test/TestHelpers.swift | 2 +- demo/demo-test/keepSessionAlive_test.swift | 2 +- demo/demo-test/loginWithMagicLink_test.swift | 12 +++++------ demo/demo-test/loginWithOIDC_test.swift | 10 ++++----- demo/demo-test/loginWithPassword_test.swift | 16 +++++++------- demo/demo-test/loginWithSAML_test.swift | 22 ++++++++++---------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/demo/demo-test/TestHelpers.swift b/demo/demo-test/TestHelpers.swift index f656229..ac9d5b4 100644 --- a/demo/demo-test/TestHelpers.swift +++ b/demo/demo-test/TestHelpers.swift @@ -47,7 +47,7 @@ extension XCTestCase { func waitForLoader(_ app: XCUIApplication) async { // Wait for the loading indicator to disappear = content is ready - let activityIndicator = app.otherElements["LoaderView"] + let activityIndicator = await app.otherElements["LoaderView"] expectation(for: NSPredicate(format: "exists == 0"), evaluatedWith: activityIndicator) await waitForExpectations(timeout: 30) } diff --git a/demo/demo-test/keepSessionAlive_test.swift b/demo/demo-test/keepSessionAlive_test.swift index 5a972e0..a0cb46e 100644 --- a/demo/demo-test/keepSessionAlive_test.swift +++ b/demo/demo-test/keepSessionAlive_test.swift @@ -32,7 +32,7 @@ final class keepSessionAlive_test: XCTestCase { - let successField = app.staticTexts["test@frontegg.com"] + let successField = await app.staticTexts["test@frontegg.com"] XCTAssert(successField.waitForExistence(timeout: 10)) DispatchQueue.main.sync { app.terminate() } diff --git a/demo/demo-test/loginWithMagicLink_test.swift b/demo/demo-test/loginWithMagicLink_test.swift index d105c4e..dd1bdff 100644 --- a/demo/demo-test/loginWithMagicLink_test.swift +++ b/demo/demo-test/loginWithMagicLink_test.swift @@ -46,30 +46,30 @@ final class loginWithMagicLink_test: XCTestCase { await waitForLoader(app) - let userNameField = app.getWebInput("Email is required") + let userNameField = await app.getWebInput("Email is required") sleep(1) - userNameField.safeTypeText("test@frontegg.com") + await userNameField.safeTypeText("test@frontegg.com") await Mocker.mock(name: .mockPreLoginWithMagicLink, body: [:]) - app.getWebButton("Continue").safeTap() + await app.getWebButton("Continue").safeTap() - app.waitWebLabel("Magic link sent!") + await app.waitWebLabel("Magic link sent!") takeScreenshot(named: "MagicLinkSent") let magicLinkUrl = await Mocker.mockSuccessMagicLink(code) let safari = DeepLinkUtils.openFromSafari(with: magicLinkUrl) - safari.getWebButton("Sign In").safeTap() + await safari.getWebButton("Sign In").safeTap() XCTAssert(app.wait(for: .runningForeground, timeout: 10)) - let successField = app.staticTexts["test@frontegg.com"] + let successField = await app.staticTexts["test@frontegg.com"] XCTAssert(successField.waitForExistence(timeout: 20)) DispatchQueue.main.sync { app.terminate() } diff --git a/demo/demo-test/loginWithOIDC_test.swift b/demo/demo-test/loginWithOIDC_test.swift index a317f13..d79e829 100644 --- a/demo/demo-test/loginWithOIDC_test.swift +++ b/demo/demo-test/loginWithOIDC_test.swift @@ -42,23 +42,23 @@ final class loginWithOIDC_test: XCTestCase { await waitForLoader(app) - app.getWebInput("Email is required") + await app.getWebInput("Email is required") .safeTypeText("test@oidc-domain.com") await Mocker.mock(name: .mockSSOPrelogin, body: ["options": ["success":"true", "idpType": "oidc"], "partialRequestBody": ["email": "test@oidc-domain.com"]]) - app.getWebButton("Continue").safeTap() + await app.getWebButton("Continue").safeTap() - app.waitWebLabel("OKTA OIDC Mock Server") + await app.waitWebLabel("OKTA OIDC Mock Server") await Mocker.mockSuccessOidcLogin(code) - app.getWebButton("Login With Okta").safeTap() + await app.getWebButton("Login With Okta").safeTap() - let successField = app.staticTexts["test@oidc-domain.com"] + let successField = await app.staticTexts["test@oidc-domain.com"] XCTAssert(successField.waitForExistence(timeout: 10)) DispatchQueue.main.sync { app.terminate() } diff --git a/demo/demo-test/loginWithPassword_test.swift b/demo/demo-test/loginWithPassword_test.swift index ef2f773..b3b64ee 100644 --- a/demo/demo-test/loginWithPassword_test.swift +++ b/demo/demo-test/loginWithPassword_test.swift @@ -41,33 +41,33 @@ final class loginWithPassword_test: XCTestCase { await waitForLoader(app) - let userNameField = app.getWebInput("Email is required") + let userNameField = await app.getWebInput("Email is required") takeScreenshot(named: "LoginPage") - userNameField.safeTypeText("test@frontegg.com") + await userNameField.safeTypeText("test@frontegg.com") await Mocker.mock(name: .mockSSOPrelogin, body: [ "options": ["success": false]]) - let continueButton = app.getWebButton("Continue") + let continueButton = await app.getWebButton("Continue") takeScreenshot(named: "PreLogin") - continueButton.safeTap() + await continueButton.safeTap() - let passwordField = app.getWebPasswordInput("Password is required") + let passwordField = await app.getWebPasswordInput("Password is required") - passwordField.safeTypeText("Testpassword") + await passwordField.safeTypeText("Testpassword") await Mocker.mockSuccessPasswordLogin(code) - app.getWebButton("Sign in").safeTap() + await app.getWebButton("Sign in").safeTap() - let successField = app.staticTexts["test@frontegg.com"] + let successField = await app.staticTexts["test@frontegg.com"] XCTAssert(successField.waitForExistence(timeout: 10)) DispatchQueue.main.sync { app.terminate() } diff --git a/demo/demo-test/loginWithSAML_test.swift b/demo/demo-test/loginWithSAML_test.swift index f69a708..a8d8cbc 100644 --- a/demo/demo-test/loginWithSAML_test.swift +++ b/demo/demo-test/loginWithSAML_test.swift @@ -40,7 +40,7 @@ final class loginWithSAML_test: XCTestCase { await waitForLoader(app) - let userNameField = app.getWebInput("Email is required") + let userNameField = await app.getWebInput("Email is required") takeScreenshot(named: "LoginPage") @@ -49,11 +49,11 @@ final class loginWithSAML_test: XCTestCase { await Mocker.mock(name: .mockSSOPrelogin, body: ["options": ["success":"true", "idpType": "saml"], "partialRequestBody": ["email": "test@saml-domain.com"]]) - userNameField.safeTypeText("test@saml-domain.com") + await userNameField.safeTypeText("test@saml-domain.com") - app.getWebButton("Continue").safeTap() + await app.getWebButton("Continue").safeTap() - app.waitWebLabel("OKTA SAML Mock Server") + await app.waitWebLabel("OKTA SAML Mock Server") await Mocker.mock(name: .mockSSOAuthSamlCallback, body: ["options":[ @@ -63,25 +63,25 @@ final class loginWithSAML_test: XCTestCase { - app.getWebButton("Login With Okta").safeTap() + await app.getWebButton("Login With Okta").safeTap() - let backToLoginButton = app.getWebLabel("Back to Sign-in") + let backToLoginButton = await app.getWebLabel("Back to Sign-in") takeScreenshot(named: "Invalid Saml") - backToLoginButton.safeTap() + await backToLoginButton.safeTap() - app.getWebInput("Email is required").safeTypeText("test@saml-domain.com") + await app.getWebInput("Email is required").safeTypeText("test@saml-domain.com") - app.getWebButton("Continue").safeTap() + await app.getWebButton("Continue").safeTap() await Mocker.mockSuccessSamlLogin(code) - app.getWebButton("Login With Okta").safeTap() + await app.getWebButton("Login With Okta").safeTap() - let successField = app.staticTexts["test@saml-domain.com"] + let successField = await app.staticTexts["test@saml-domain.com"] XCTAssert(successField.waitForExistence(timeout: 10)) DispatchQueue.main.sync { app.terminate() }