Skip to content

Commit c418a33

Browse files
committed
chore: add authenticator tests to main_test file and move getOtpCode up on some tests to get code faster
1 parent ddb8ab7 commit c418a33

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

packages/authenticator/amplify_authenticator/example/integration_test/main_test.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ import 'http_test.dart' as http_tests;
1313
import 'reset_password_test.dart' as reset_password_tests;
1414
import 'sign_in_force_new_password_test.dart'
1515
as sign_in_force_new_password_tests;
16+
import 'sign_in_mfa_email_test.dart' as sign_in_mfa_email_tests;
17+
import 'sign_in_mfa_email_totp_test.dart' as sign_in_mfa_email_totp_tests;
18+
import 'sign_in_mfa_sms_email_test.dart' as sign_in_mfa_sms_email_tests;
1619
import 'sign_in_mfa_sms_test.dart' as sign_in_mfa_sms_tests;
1720
import 'sign_in_mfa_sms_totp_test.dart' as sign_in_mfa_sms_totp_tests;
1821
import 'sign_in_mfa_totp_test.dart' as sign_in_mfa_totp_tests;
22+
import 'sign_in_mfa_username_login_test.dart' as sign_in_mfa_username_login_tests;
1923
import 'sign_in_with_email_test.dart' as sign_in_with_email_tests;
2024
import 'sign_in_with_phone_test.dart' as sign_in_with_phone_tests;
2125
import 'sign_in_with_username_test.dart' as sign_in_with_username_tests;
@@ -45,6 +49,10 @@ void main() {
4549
sign_in_with_email_tests.main();
4650
sign_in_with_phone_tests.main();
4751
sign_in_with_username_tests.main();
52+
sign_in_mfa_email_tests.main();
53+
sign_in_mfa_email_totp_tests.main();
54+
sign_in_mfa_sms_email_tests.main();
55+
sign_in_mfa_username_login_tests.main();
4856
sign_out_tests.main();
4957
sign_up_with_email_tests.main();
5058
sign_up_with_email_with_lambda_trigger_tests.main();

packages/authenticator/amplify_authenticator/example/integration_test/sign_in_mfa_email_test.dart

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ void main() {
4848
final signInPage = SignInPage(tester: tester);
4949
final confirmSignInPage = ConfirmSignInPage(tester: tester);
5050

51+
final otpResult = await getOtpCode(
52+
env.getLoginAttribute(username),
53+
);
54+
5155
// When I type my "username"
5256
await signInPage.enterUsername(username);
5357

@@ -60,9 +64,6 @@ void main() {
6064
// Then I will be redirected to the email MFA code page
6165
await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
6266

63-
final otpResult = await getOtpCode(
64-
env.getLoginAttribute(username),
65-
);
6667
// And I type a valid EMAIL OTP code
6768
await confirmSignInPage.enterVerificationCode(await otpResult.code);
6869

@@ -76,6 +77,10 @@ void main() {
7677
await Amplify.Auth.signOut();
7778
await tester.pumpAndSettle();
7879

80+
final otpResult2 = await getOtpCode(
81+
env.getLoginAttribute(username),
82+
);
83+
7984
// Then I see the sign in page
8085
signInPage.expectUsername(label: 'Email');
8186

@@ -91,10 +96,6 @@ void main() {
9196
// Then I will be redirected to the EMAIL OTP code page
9297
await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
9398

94-
final otpResult2 = await getOtpCode(
95-
env.getLoginAttribute(username),
96-
);
97-
9899
// When I type a valid EMAIL OTP code
99100
await confirmSignInPage.enterVerificationCode(await otpResult2.code);
100101

packages/authenticator/amplify_authenticator/example/integration_test/sign_in_mfa_sms_email_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ void main() {
8686
await Amplify.Auth.signOut();
8787
await tester.pumpAndSettle();
8888

89+
final code_2 = await getOtpCode(env.getLoginAttribute(username));
90+
8991
// Then I see the sign in page
9092
signInPage.expectEmail();
9193

@@ -101,8 +103,6 @@ void main() {
101103
// Then I will be redirected to the EMAIL MFA code page
102104
await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
103105

104-
final code_2 = await getOtpCode(env.getLoginAttribute(username));
105-
106106
// When I type a valid EMAIL MFA code
107107
await confirmSignInPage.enterVerificationCode(await code_2.code);
108108

@@ -184,6 +184,9 @@ void main() {
184184
await Amplify.Auth.signOut();
185185
await tester.pumpAndSettle();
186186

187+
final smsResult_2 =
188+
await getOtpCode(UserAttribute.phone(phoneNumber.toE164()));
189+
187190
// Then I see the sign in page
188191
signInPage.expectEmail();
189192

@@ -196,9 +199,6 @@ void main() {
196199
// And I click the "Sign in" button
197200
await signInPage.submitSignIn();
198201

199-
final smsResult_2 =
200-
await getOtpCode(UserAttribute.phone(phoneNumber.toE164()));
201-
202202
// Then I will be redirected to the confirm sms mfa page
203203
await confirmSignInPage.expectConfirmSignInMFAIsPresent();
204204

0 commit comments

Comments
 (0)