Skip to content

Commit 96cdb46

Browse files
committed
chore: running passwordless integration tests on GEN2 backend
1 parent 959e596 commit 96cdb46

File tree

6 files changed

+32
-16
lines changed

6 files changed

+32
-16
lines changed

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@
6161
485CB5C027B61F1E006CCEC7 /* SignedOutAuthSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485CB5BC27B61F1D006CCEC7 /* SignedOutAuthSessionTests.swift */; };
6262
485CB5C127B61F1E006CCEC7 /* AuthSignOutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485CB5BD27B61F1D006CCEC7 /* AuthSignOutTests.swift */; };
6363
485CB5C227B61F1E006CCEC7 /* AuthSRPSignInTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485CB5BE27B61F1D006CCEC7 /* AuthSRPSignInTests.swift */; };
64+
486D622F2CF23FA6001FD075 /* PasswordlessSignUpTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979D8A572CE283CA00E9B28F /* PasswordlessSignUpTests.swift */; };
65+
486D62302CF23FA6001FD075 /* PasswordlessConfirmSignUpTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979D8A592CE283DD00E9B28F /* PasswordlessConfirmSignUpTests.swift */; };
66+
486D62312CF23FA6001FD075 /* PasswordlessAutoSignInTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979D8A5B2CE283E900E9B28F /* PasswordlessAutoSignInTests.swift */; };
67+
486D62322CF23FA6001FD075 /* PasswordlessAutoSignInTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979D8A5B2CE283E900E9B28F /* PasswordlessAutoSignInTests.swift */; };
68+
486D62332CF23FA6001FD075 /* PasswordlessConfirmSignUpTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979D8A592CE283DD00E9B28F /* PasswordlessConfirmSignUpTests.swift */; };
69+
486D62342CF23FA6001FD075 /* PasswordlessSignUpTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 979D8A572CE283CA00E9B28F /* PasswordlessSignUpTests.swift */; };
6470
487C40232CACF303009CF221 /* EmailMFAWithAllMFATypesRequiredTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 487C40222CACF2FD009CF221 /* EmailMFAWithAllMFATypesRequiredTests.swift */; };
6571
487C40242CACF303009CF221 /* EmailMFAWithAllMFATypesRequiredTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 487C40222CACF2FD009CF221 /* EmailMFAWithAllMFATypesRequiredTests.swift */; };
6672
487C40252CACF303009CF221 /* EmailMFAWithAllMFATypesRequiredTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 487C40222CACF2FD009CF221 /* EmailMFAWithAllMFATypesRequiredTests.swift */; };
@@ -424,7 +430,6 @@
424430
485CB5C327B61F4A006CCEC7 /* SignInTests */ = {
425431
isa = PBXGroup;
426432
children = (
427-
48DEF5992CDB1FF500BDB995 /* PasswordlessSignInTests.swift */,
428433
485CB5BE27B61F1D006CCEC7 /* AuthSRPSignInTests.swift */,
429434
4821B2F328737130000EC1D7 /* AuthCustomSignInTests.swift */,
430435
);
@@ -515,6 +520,7 @@
515520
979D8A572CE283CA00E9B28F /* PasswordlessSignUpTests.swift */,
516521
979D8A592CE283DD00E9B28F /* PasswordlessConfirmSignUpTests.swift */,
517522
979D8A5B2CE283E900E9B28F /* PasswordlessAutoSignInTests.swift */,
523+
48DEF5992CDB1FF500BDB995 /* PasswordlessSignInTests.swift */,
518524
);
519525
path = PasswordlessTests;
520526
sourceTree = "<group>";
@@ -852,6 +858,9 @@
852858
buildActionMask = 2147483647;
853859
files = (
854860
21F762A52BD6B1AA0048845A /* AuthSessionHelper.swift in Sources */,
861+
486D62322CF23FA6001FD075 /* PasswordlessAutoSignInTests.swift in Sources */,
862+
486D62332CF23FA6001FD075 /* PasswordlessConfirmSignUpTests.swift in Sources */,
863+
486D62342CF23FA6001FD075 /* PasswordlessSignUpTests.swift in Sources */,
855864
21F762A62BD6B1AA0048845A /* AsyncTesting.swift in Sources */,
856865
21F762A72BD6B1AA0048845A /* AuthSRPSignInTests.swift in Sources */,
857866
21F762A82BD6B1AA0048845A /* AuthForgetDeviceTests.swift in Sources */,
@@ -964,6 +973,9 @@
964973
681B76A92A3CBBAE004B59D9 /* AuthFetchDeviceTests.swift in Sources */,
965974
48BCE8922A5456460012C3CD /* TOTPSetupWhenAuthenticatedTests.swift in Sources */,
966975
48BCE8962A5456600012C3CD /* TOTPHelper.swift in Sources */,
976+
486D622F2CF23FA6001FD075 /* PasswordlessSignUpTests.swift in Sources */,
977+
486D62302CF23FA6001FD075 /* PasswordlessConfirmSignUpTests.swift in Sources */,
978+
486D62312CF23FA6001FD075 /* PasswordlessAutoSignInTests.swift in Sources */,
967979
681B76AA2A3CBBAE004B59D9 /* AsyncExpectation.swift in Sources */,
968980
48BCE8932A54564C0012C3CD /* TOTPSetupWhenUnauthenticatedTests.swift in Sources */,
969981
681B76AB2A3CBBAE004B59D9 /* GetCurrentUserTests.swift in Sources */,

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/PasswordlessTests/PasswordlessAutoSignInTests.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ import AWSAPIPlugin
1313
class PasswordlessAutoSignInTests: AWSAuthBaseTest {
1414

1515
override func setUp() async throws {
16+
// Only run these tests with Gen2 configuration
17+
onlyUseGen2Configuration = true
18+
1619
// Use a custom configuration these tests
17-
amplifyConfigurationFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplifyconfiguration"
20+
amplifyOutputsFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplify_outputs"
1821

1922
// Add API plugin to Amplify
2023
let awsApiPlugin = AWSAPIPlugin()

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/PasswordlessTests/PasswordlessConfirmSignUpTests.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ import AWSAPIPlugin
1313
class PasswordlessConfirmSignUpTests: AWSAuthBaseTest {
1414

1515
override func setUp() async throws {
16+
// Only run these tests with Gen2 configuration
17+
onlyUseGen2Configuration = true
18+
1619
// Use a custom configuration these tests
17-
amplifyConfigurationFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplifyconfiguration"
20+
amplifyOutputsFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplify_outputs"
1821

1922
// Add API plugin to Amplify
2023
let awsApiPlugin = AWSAPIPlugin()
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ class PasswordlessSignInTests: AWSAuthBaseTest {
1717

1818
override func setUp() async throws {
1919

20+
// Only run these tests with Gen2 configuration
21+
onlyUseGen2Configuration = true
22+
2023
// Use a custom configuration these tests
21-
amplifyConfigurationFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplifyconfiguration"
24+
amplifyOutputsFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplify_outputs"
2225

2326
// Add API plugin to Amplify
2427
let awsApiPlugin = AWSAPIPlugin()

AmplifyPlugins/Auth/Tests/AuthHostApp/AuthIntegrationTests/PasswordlessTests/PasswordlessSignUpTests.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ import AWSAPIPlugin
1313
class PasswordlessSignUpTests: AWSAuthBaseTest {
1414

1515
override func setUp() async throws {
16+
// Only run these tests with Gen2 configuration
17+
onlyUseGen2Configuration = true
18+
1619
// Use a custom configuration these tests
17-
amplifyConfigurationFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplifyconfiguration"
20+
amplifyOutputsFile = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplify_outputs"
1821

1922
// Add API plugin to Amplify
2023
let awsApiPlugin = AWSAPIPlugin()

AmplifyPlugins/Auth/Tests/AuthWebAuthnApp/AuthWebAuthnApp/AuthWebAuthnAppApp.swift

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,15 @@ import SwiftUI
1111

1212
@main
1313
struct AuthWebAuthnAppApp: App {
14-
private let amplifyConfigurationFilePath = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplifyconfiguration"
14+
1515
private let amplifyOutputsFilePath = "testconfiguration/AWSCognitoPluginPasswordlessIntegrationTests-amplify_outputs"
1616

1717
init() {
1818
do {
1919
try Amplify.add(plugin: AWSCognitoAuthPlugin())
2020

21-
if useGen2Configuration {
22-
let data = try TestConfigHelper.retrieve(forResource: amplifyOutputsFilePath)
23-
try Amplify.configure(with: .data(data))
24-
} else {
25-
let config = try TestConfigHelper.retrieveAmplifyConfiguration(forResource: amplifyConfigurationFilePath)
26-
try Amplify.configure(config)
27-
}
21+
let data = try TestConfigHelper.retrieve(forResource: amplifyOutputsFilePath)
22+
try Amplify.configure(with: .data(data))
2823
print("Amplify configured!")
2924
} catch {
3025
print("Failed to init Amplify", error)
@@ -37,7 +32,4 @@ struct AuthWebAuthnAppApp: App {
3732
}
3833
}
3934

40-
private var useGen2Configuration: Bool {
41-
ProcessInfo.processInfo.arguments.contains("GEN2")
42-
}
4335
}

0 commit comments

Comments
 (0)