From f9b45494e116ab5d92519d7c73abcee40dd73551 Mon Sep 17 00:00:00 2001 From: Craig Russell <1336281+CDRussell@users.noreply.github.com> Date: Tue, 27 May 2025 13:22:13 +0100 Subject: [PATCH 1/2] Update non-critical Autofill tests so they can run against internal builds again --- .maestro/autofill/1_autofill_shown_in_overflow.yaml | 1 + .../autofill/2_autofill_add_search_update_delete_creds.yaml | 1 + .../autofill/3_autofill_prompted_to_save_creds_on_form.yaml | 1 + .maestro/autofill/4_autofill_settings_creds.yaml | 1 + .../multi_step_login_username_backfilled.yaml | 1 + .../multi_step_login_username_backfilled_for_an_update.yaml | 1 + ...p_login_username_not_backfilled_if_provided_explicitly.yaml | 1 + ...egistration_username_backfilled_password_autogenerated.yaml | 3 +++ ...stration_username_backfilled_password_manually_entered.yaml | 1 + .../password_reset_flow_autogenerated_password.yaml | 3 +++ ..._reset_flow_for_existing_credential_generated_password.yaml | 1 + ...ord_reset_flow_for_existing_credential_manual_password.yaml | 1 + ...saves_credential_when_password_generated_with_username.yaml | 1 + ...es_credential_when_password_generated_without_username.yaml | 1 + 14 files changed, 18 insertions(+) diff --git a/.maestro/autofill/1_autofill_shown_in_overflow.yaml b/.maestro/autofill/1_autofill_shown_in_overflow.yaml index 4599cb3b6b58..a2fd4c38502f 100644 --- a/.maestro/autofill/1_autofill_shown_in_overflow.yaml +++ b/.maestro/autofill/1_autofill_shown_in_overflow.yaml @@ -11,4 +11,5 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml + - hideKeyboard - runFlow: steps/access_passwords_screen.yaml \ No newline at end of file diff --git a/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml b/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml index 1b6227c4a544..08d8f67397f9 100644 --- a/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml +++ b/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml @@ -10,6 +10,7 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml + - hideKeyboard - runFlow: steps/access_passwords_screen.yaml - assertVisible: diff --git a/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml b/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml index b89e81b60032..f359f2670c80 100644 --- a/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml +++ b/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml @@ -10,6 +10,7 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml + - hideKeyboard - tapOn: id: "omnibarTextInput" diff --git a/.maestro/autofill/4_autofill_settings_creds.yaml b/.maestro/autofill/4_autofill_settings_creds.yaml index 6762dfce3fbd..e6b345c3f489 100644 --- a/.maestro/autofill/4_autofill_settings_creds.yaml +++ b/.maestro/autofill/4_autofill_settings_creds.yaml @@ -10,6 +10,7 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml + - hideKeyboard - tapOn: id: "com.duckduckgo.mobile.android:id/browserMenuImageView" diff --git a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml index 17d6b32159c3..d1c6c21eb73a 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml index 10aacfbecaf2..bde202c18e0f 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # setup an existing credential - runFlow: ../steps/manually_add_existing_credential.yaml diff --git a/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml b/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml index e82702869608..758225983a69 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml index 8fc68593f4fe..6a01c075a9ce 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill form - tapOn: @@ -41,6 +42,8 @@ tags: text: "Register" index: 1 + - hideKeyboard + # access the passwords screen and assert username and password both saved - runFlow: ../steps/access_passwords_screen.yaml - tapOn: "usernameFromBackfill" diff --git a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml index 7d13b68548e1..688586b6daa6 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml b/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml index 0acc615bfe29..cad21ad6cf92 100644 --- a/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml +++ b/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill login form - tapOn: @@ -43,6 +44,8 @@ tags: text: "Change Password" index: 1 + - hideKeyboard + # access the passwords screen and assert username and password both saved - runFlow: ../steps/access_passwords_screen.yaml - tapOn: "usernameFromBackfill" diff --git a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml index 2d3ac5434b4c..df7dbc93ac29 100644 --- a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml +++ b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill login form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml index 6ce357c9054d..8d7c889503c6 100644 --- a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml +++ b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # manually add a credential - runFlow: ../steps/manually_add_existing_credential.yaml diff --git a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml index 9c8f669ba9d1..3be58edb7d9d 100644 --- a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml +++ b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill form - tapOn: diff --git a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml index 2a43be964c7e..79925dfe5c13 100644 --- a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml +++ b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml @@ -12,6 +12,7 @@ tags: clearState: true - runFlow: ../../shared/skip_all_onboarding.yaml + - hideKeyboard # get to autofill form - tapOn: From 0c55c6f9fecc051ba318af460d28054cb3982a6c Mon Sep 17 00:00:00 2001 From: Craig Russell <1336281+CDRussell@users.noreply.github.com> Date: Tue, 27 May 2025 14:07:27 +0100 Subject: [PATCH 2/2] Update gradle task for running autofill tests locally to cover more test types --- autofill/autofill-impl/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autofill/autofill-impl/build.gradle b/autofill/autofill-impl/build.gradle index 0f902570737d..7161ec498a79 100644 --- a/autofill/autofill-impl/build.gradle +++ b/autofill/autofill-impl/build.gradle @@ -128,10 +128,10 @@ android { } tasks.register('installForAutofillTesting', Exec) { - commandLine "$rootDir/gradlew", ':app:installInternalRelease', "-P$autofillDisableAuthRequirementBuildFlag" + commandLine "$rootDir/gradlew", ':app:installInternalRelease', "-Pforce-default-variant", "-P$autofillDisableAuthRequirementBuildFlag" } tasks.register('autofillTestLocal', Exec) { - commandLine 'maestro', 'test', '--include-tags', 'autofillNoAuthTests', "$rootDir/.maestro" + commandLine 'maestro', 'test', '--include-tags', 'autofillNoAuthTests,autofillPasswordGeneration,autofillBackfillingUsername', "$rootDir/.maestro" dependsOn 'installForAutofillTesting' } \ No newline at end of file