diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
tree | 871fc667d2de662f171103ce5ec067014ef85e61 /browser/components/translations/tests | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-adbda400be353e676059e335c3c0aaf99e719475.tar.xz firefox-adbda400be353e676059e335c3c0aaf99e719475.zip |
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/translations/tests')
-rw-r--r-- | browser/components/translations/tests/browser/browser.toml | 96 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_a11y_focus.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_a11y_focus.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_bad_data.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_bad_data.js) | 5 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_basic.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_basic.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_manual.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_manual.js) | 6 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_restore.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_restore.js) | 6 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_app_menu_never_translate_language.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_app_menu_never_translate_language.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_app_menu_never_translate_site.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_app_menu_never_translate_site.js) | 8 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_auto_translate_error_view.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_auto_translate_error_view.js) | 6 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_auto_translate_revisit_view.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_auto_translate_revisit_view.js) | 6 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_basics.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_basics.js) | 8 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_button.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_button.js) | 0 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_cancel.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_cancel.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_active.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_language_with_translations_active.js) | 14 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_inactive.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_language_with_translations_inactive.js) | 10 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_site.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_site.js) | 16 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_destroy.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_engine_destroy.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_destroy_pending.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_engine_destroy_pending.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_unsupported.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_engine_unsupported.js) | 0 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_unsupported_lang.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_engine_unsupported_lang.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_firstrun.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_firstrun.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_firstrun_revisit.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_firstrun_revisit.js) | 8 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_fuzzing.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_fuzzing.js) | 6 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_gear.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_gear.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_language.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_never_translate_language.js) | 10 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_never_translate_site.js) | 10 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_auto.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_auto.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_basic.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_basic.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_manual.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_manual.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_retry.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_retry.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_settings_unsupported_lang.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_settings_unsupported_lang.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_panel_switch_languages.js (renamed from browser/components/translations/tests/browser/browser_translations_panel_switch_languages.js) | 8 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_reader_mode.js (renamed from browser/components/translations/tests/browser/browser_translations_reader_mode.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_auto_translate.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_auto_translate.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_basics.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_basics.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_translation_failure.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_translation_failure.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_unsupported_lang.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_unsupported_lang.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_open_panel.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_open_panel.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_panel_auto_offer.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_panel_auto_offer.js) | 0 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_panel_auto_offer_settings.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_panel_auto_offer_settings.js) | 4 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_switch_languages.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_switch_languages.js) | 8 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_translation_failure.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_translation_failure.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_full_page_telemetry_translation_request.js (renamed from browser/components/translations/tests/browser/browser_translations_telemetry_translation_request.js) | 2 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_select_context_menu_with_full_page_translations_active.js | 8 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_select_panel_language_selectors.js | 54 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/browser_translations_select_panel_mainview_ui.js | 36 | ||||
-rw-r--r-- | browser/components/translations/tests/browser/head.js | 604 |
47 files changed, 717 insertions, 290 deletions
diff --git a/browser/components/translations/tests/browser/browser.toml b/browser/components/translations/tests/browser/browser.toml index bc617bf2fd..a9d36363da 100644 --- a/browser/components/translations/tests/browser/browser.toml +++ b/browser/components/translations/tests/browser/browser.toml @@ -15,96 +15,100 @@ support-files = [ ["browser_translations_about_preferences_settings_ui.js"] -["browser_translations_panel_a11y_focus.js"] +["browser_translations_full_page_panel_a11y_focus.js"] -["browser_translations_panel_always_translate_language_bad_data.js"] +["browser_translations_full_page_panel_always_translate_language_bad_data.js"] -["browser_translations_panel_always_translate_language_basic.js"] +["browser_translations_full_page_panel_always_translate_language_basic.js"] -["browser_translations_panel_always_translate_language_manual.js"] +["browser_translations_full_page_panel_always_translate_language_manual.js"] -["browser_translations_panel_always_translate_language_restore.js"] +["browser_translations_full_page_panel_always_translate_language_restore.js"] -["browser_translations_panel_app_menu_never_translate_language.js"] +["browser_translations_full_page_panel_app_menu_never_translate_language.js"] -["browser_translations_panel_app_menu_never_translate_site.js"] +["browser_translations_full_page_panel_app_menu_never_translate_site.js"] -["browser_translations_panel_auto_translate_error_view.js"] +["browser_translations_full_page_panel_auto_translate_error_view.js"] -["browser_translations_panel_auto_translate_revisit_view.js"] +["browser_translations_full_page_panel_auto_translate_revisit_view.js"] -["browser_translations_panel_basics.js"] +["browser_translations_full_page_panel_basics.js"] -["browser_translations_panel_button.js"] +["browser_translations_full_page_panel_button.js"] -["browser_translations_panel_cancel.js"] +["browser_translations_full_page_panel_cancel.js"] -["browser_translations_panel_close_panel_never_translate_language_with_translations_active.js"] +["browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_active.js"] -["browser_translations_panel_close_panel_never_translate_language_with_translations_inactive.js"] +["browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_inactive.js"] -["browser_translations_panel_close_panel_never_translate_site.js"] +["browser_translations_full_page_panel_close_panel_never_translate_site.js"] -["browser_translations_panel_engine_destroy.js"] +["browser_translations_full_page_panel_engine_destroy.js"] -["browser_translations_panel_engine_destroy_pending.js"] +["browser_translations_full_page_panel_engine_destroy_pending.js"] -["browser_translations_panel_engine_unsupported.js"] +["browser_translations_full_page_panel_engine_unsupported.js"] -["browser_translations_panel_engine_unsupported_lang.js"] +["browser_translations_full_page_panel_engine_unsupported_lang.js"] -["browser_translations_panel_firstrun.js"] +["browser_translations_full_page_panel_firstrun.js"] -["browser_translations_panel_firstrun_revisit.js"] +["browser_translations_full_page_panel_firstrun_revisit.js"] -["browser_translations_panel_fuzzing.js"] +["browser_translations_full_page_panel_fuzzing.js"] skip-if = ["true"] -["browser_translations_panel_gear.js"] +["browser_translations_full_page_panel_gear.js"] -["browser_translations_panel_never_translate_language.js"] +["browser_translations_full_page_panel_never_translate_language.js"] -["browser_translations_panel_never_translate_site_auto.js"] +["browser_translations_full_page_panel_never_translate_site_auto.js"] -["browser_translations_panel_never_translate_site_basic.js"] +["browser_translations_full_page_panel_never_translate_site_basic.js"] -["browser_translations_panel_never_translate_site_manual.js"] +["browser_translations_full_page_panel_never_translate_site_manual.js"] -["browser_translations_panel_retry.js"] +["browser_translations_full_page_panel_retry.js"] skip-if = ["os == 'linux' && !debug"] # Bug 1863227 -["browser_translations_panel_settings_unsupported_lang.js"] +["browser_translations_full_page_panel_settings_unsupported_lang.js"] -["browser_translations_panel_switch_languages.js"] +["browser_translations_full_page_panel_switch_languages.js"] -["browser_translations_reader_mode.js"] +["browser_translations_full_page_reader_mode.js"] -["browser_translations_select_context_menu_feature_disabled.js"] +["browser_translations_full_page_telemetry_firstrun_auto_translate.js"] -["browser_translations_select_context_menu_with_full_page_translations_active.js"] +["browser_translations_full_page_telemetry_firstrun_basics.js"] -["browser_translations_select_context_menu_with_hyperlink.js"] +["browser_translations_full_page_telemetry_firstrun_translation_failure.js"] -["browser_translations_select_context_menu_with_no_text_selected.js"] +["browser_translations_full_page_telemetry_firstrun_unsupported_lang.js"] -["browser_translations_select_context_menu_with_text_selected.js"] +["browser_translations_full_page_telemetry_open_panel.js"] + +["browser_translations_full_page_telemetry_panel_auto_offer.js"] -["browser_translations_telemetry_firstrun_auto_translate.js"] +["browser_translations_full_page_telemetry_panel_auto_offer_settings.js"] -["browser_translations_telemetry_firstrun_basics.js"] +["browser_translations_full_page_telemetry_switch_languages.js"] -["browser_translations_telemetry_firstrun_translation_failure.js"] +["browser_translations_full_page_telemetry_translation_failure.js"] -["browser_translations_telemetry_firstrun_unsupported_lang.js"] +["browser_translations_full_page_telemetry_translation_request.js"] -["browser_translations_telemetry_open_panel.js"] +["browser_translations_select_context_menu_feature_disabled.js"] + +["browser_translations_select_context_menu_with_full_page_translations_active.js"] -["browser_translations_telemetry_panel_auto_offer.js"] +["browser_translations_select_context_menu_with_hyperlink.js"] -["browser_translations_telemetry_panel_auto_offer_settings.js"] +["browser_translations_select_context_menu_with_no_text_selected.js"] -["browser_translations_telemetry_switch_languages.js"] +["browser_translations_select_context_menu_with_text_selected.js"] -["browser_translations_telemetry_translation_failure.js"] +["browser_translations_select_panel_language_selectors.js"] -["browser_translations_telemetry_translation_request.js"] +["browser_translations_select_panel_mainview_ui.js"] diff --git a/browser/components/translations/tests/browser/browser_translations_panel_a11y_focus.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_a11y_focus.js index e2e8663f6d..433861c05a 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_a11y_focus.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_a11y_focus.js @@ -17,7 +17,7 @@ add_task(async function test_translations_panel_a11y_focus() { "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openWithKeyboard: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_bad_data.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_bad_data.js index ac026fb78f..144488ac7b 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_bad_data.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_bad_data.js @@ -13,7 +13,7 @@ add_task(async function test_always_translate_with_bad_data() { prefs: [["browser.translations.alwaysTranslateLanguages", "en,fr"]], }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, openFromAppMenu: true, }); @@ -23,8 +23,7 @@ add_task(async function test_always_translate_with_bad_data() { checked: false, disabled: true, }); - await closeSettingsMenuIfOpen(); - await closeTranslationsPanelIfOpen(); + await closeAllOpenPanelsAndMenus(); info("Checking that the page is untranslated"); await runInPage(async TranslationsTest => { diff --git a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_basic.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_basic.js index 2644d78f33..bd9a8a7756 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_basic.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_basic.js @@ -21,7 +21,7 @@ add_task(async function test_toggle_always_translate_language_menuitem() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -55,7 +55,7 @@ add_task(async function test_toggle_always_translate_language_menuitem() { "The page should be automatically translated." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_manual.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_manual.js index 8456b4cc08..d47732aa5c 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_manual.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_manual.js @@ -22,7 +22,7 @@ add_task( await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -36,7 +36,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -55,7 +55,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_restore.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_restore.js index 6cf89d2a03..cd3fe76c58 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_always_translate_language_restore.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_always_translate_language_restore.js @@ -22,7 +22,7 @@ add_task( await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -56,7 +56,7 @@ add_task( "The page should be automatically translated." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); @@ -69,7 +69,7 @@ add_task( await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_app_menu_never_translate_language.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_app_menu_never_translate_language.js index ee2905ab99..14eb88f71f 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_app_menu_never_translate_language.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_app_menu_never_translate_language.js @@ -22,7 +22,7 @@ add_task(async function test_uncheck_never_translate_language_shows_button() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_app_menu_never_translate_site.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_app_menu_never_translate_site.js index 50fff4dff8..3670bb7ba1 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_app_menu_never_translate_site.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_app_menu_never_translate_site.js @@ -21,7 +21,7 @@ add_task(async function test_uncheck_never_translate_site_shows_button() { "The translations button is visible." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -36,7 +36,7 @@ add_task(async function test_uncheck_never_translate_site_shows_button() { { checked: true } ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -80,7 +80,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -105,7 +105,7 @@ add_task( await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_auto_translate_error_view.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_auto_translate_error_view.js index e71ee1392b..9470133dd0 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_auto_translate_error_view.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_auto_translate_error_view.js @@ -34,7 +34,7 @@ add_task( "The translations button is visible." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -64,14 +64,14 @@ add_task( "The translations button should be unavailable." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewUnsupportedLanguage, }); info("Destroy the engine process so that an error will happen."); - await TranslationsParent.destroyEngineProcess(); + await EngineProcess.destroyTranslationsEngine(); await navigate("Navigate back to a Spanish page.", { url: SPANISH_PAGE_URL_DOT_ORG, diff --git a/browser/components/translations/tests/browser/browser_translations_panel_auto_translate_revisit_view.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_auto_translate_revisit_view.js index dd4ffcecfd..f898300038 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_auto_translate_revisit_view.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_auto_translate_revisit_view.js @@ -29,7 +29,7 @@ add_task( "The translations button is visible." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -59,7 +59,7 @@ add_task( "The translations button should be unavailable." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewUnsupportedLanguage, @@ -76,7 +76,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_basics.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_basics.js index ef2e2c4708..30880553f0 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_basics.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_basics.js @@ -22,11 +22,11 @@ add_task(async function test_translations_panel_basics() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); - const panel = document.getElementById("translations-panel"); + const panel = document.getElementById("full-page-translations-panel"); const label = document.getElementById(panel.getAttribute("aria-labelledby")); ok(label, "The a11y label for the panel can be found."); assertVisibility({ visible: { label } }); @@ -38,7 +38,7 @@ add_task(async function test_translations_panel_basics() { "The icon presents the loading indicator." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewLoading, }); @@ -52,7 +52,7 @@ add_task(async function test_translations_panel_basics() { runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_button.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_button.js index 209cfc18a6..209cfc18a6 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_button.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_button.js diff --git a/browser/components/translations/tests/browser/browser_translations_panel_cancel.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_cancel.js index 17e680dd87..9a0a3ebccb 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_cancel.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_cancel.js @@ -17,7 +17,7 @@ add_task(async function test_translations_panel_cancel() { "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_language_with_translations_active.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_active.js index 0fbffd891a..e76c771ed9 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_language_with_translations_active.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_active.js @@ -17,7 +17,7 @@ add_task( "The translations button is available" ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -39,7 +39,7 @@ add_task( "The page should be automatically translated." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -49,7 +49,7 @@ add_task( await FullPageTranslationsTestUtils.assertIsNeverTranslateLanguage("es", { checked: false, }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", async () => { await FullPageTranslationsTestUtils.clickNeverTranslateLanguage(); @@ -79,7 +79,7 @@ add_task( "The translations button is available" ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -101,7 +101,7 @@ add_task( "The page should be automatically translated." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -119,7 +119,7 @@ add_task( ); await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -136,7 +136,7 @@ add_task( await FullPageTranslationsTestUtils.assertIsNeverTranslateLanguage("es", { checked: false, }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", async () => { await FullPageTranslationsTestUtils.clickNeverTranslateLanguage(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_language_with_translations_inactive.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_inactive.js index 5df2468646..95ff86ba7f 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_language_with_translations_inactive.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_language_with_translations_inactive.js @@ -16,7 +16,7 @@ add_task(async function test_panel_closes_on_toggle_never_translate_language() { "The translations button is available" ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -26,7 +26,7 @@ add_task(async function test_panel_closes_on_toggle_never_translate_language() { await FullPageTranslationsTestUtils.assertIsNeverTranslateLanguage("es", { checked: false, }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", async () => { await FullPageTranslationsTestUtils.clickNeverTranslateLanguage(); @@ -52,7 +52,7 @@ add_task( "The translations button is available" ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -69,7 +69,7 @@ add_task( { checked: true } ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -82,7 +82,7 @@ add_task( await FullPageTranslationsTestUtils.assertIsNeverTranslateLanguage("es", { checked: false, }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", async () => { await FullPageTranslationsTestUtils.clickNeverTranslateLanguage(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_site.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_site.js index 78679a046a..c3d1458525 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_close_panel_never_translate_site.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_close_panel_never_translate_site.js @@ -16,7 +16,7 @@ add_task(async function test_panel_closes_on_toggle_never_translate_site() { "The translations button is available" ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -27,7 +27,7 @@ add_task(async function test_panel_closes_on_toggle_never_translate_site() { SPANISH_PAGE_URL, { checked: false } ); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", async () => { await FullPageTranslationsTestUtils.clickNeverTranslateSite(); @@ -54,7 +54,7 @@ add_task( "The translations button is available" ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -78,7 +78,7 @@ add_task( "The page should be automatically translated." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -91,7 +91,7 @@ add_task( { checked: false } ); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", async () => { await FullPageTranslationsTestUtils.clickNeverTranslateSite(); @@ -119,7 +119,7 @@ add_task( "The translations button is available" ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -134,7 +134,7 @@ add_task( checked: true, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -147,7 +147,7 @@ add_task( SPANISH_PAGE_URL, { checked: false } ); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", async () => { await FullPageTranslationsTestUtils.clickNeverTranslateSite(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_engine_destroy.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_destroy.js index 0a58dd7fa6..1b498f9b07 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_engine_destroy.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_destroy.js @@ -16,7 +16,7 @@ add_task(async function test_translations_engine_destroy() { { button: true }, "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -31,7 +31,7 @@ add_task(async function test_translations_engine_destroy() { ); info("Destroy the engine process"); - await TranslationsParent.destroyEngineProcess(); + await EngineProcess.destroyTranslationsEngine(); info("Mutate the page's content to re-trigger a translation."); await runInPage(async TranslationsTest => { diff --git a/browser/components/translations/tests/browser/browser_translations_panel_engine_destroy_pending.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_destroy_pending.js index ace1a845df..cfe1997093 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_engine_destroy_pending.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_destroy_pending.js @@ -22,7 +22,7 @@ add_task(async function test_translations_engine_destroy_pending() { { button: true }, "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -42,7 +42,7 @@ add_task(async function test_translations_engine_destroy_pending() { ); info("Destroy the engine process"); - await TranslationsParent.destroyEngineProcess(); + await EngineProcess.destroyTranslationsEngine(); info("Mutate the page's content to re-trigger a translation."); await runInPage(async TranslationsTest => { diff --git a/browser/components/translations/tests/browser/browser_translations_panel_engine_unsupported.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_unsupported.js index f0804f35aa..f0804f35aa 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_engine_unsupported.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_unsupported.js diff --git a/browser/components/translations/tests/browser/browser_translations_panel_engine_unsupported_lang.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_unsupported_lang.js index 79e5c6b119..21f7e8fdb7 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_engine_unsupported_lang.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_engine_unsupported_lang.js @@ -16,7 +16,7 @@ add_task(async function test_unsupported_lang() { ], }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewUnsupportedLanguage, diff --git a/browser/components/translations/tests/browser/browser_translations_panel_firstrun.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_firstrun.js index 0c248a7837..ef807b9ac6 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_firstrun.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_firstrun.js @@ -13,7 +13,7 @@ add_task(async function test_translations_panel_firstrun() { prefs: [["browser.translations.panelShown", false]], }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); @@ -23,7 +23,7 @@ add_task(async function test_translations_panel_firstrun() { url: SPANISH_PAGE_URL_2, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_firstrun_revisit.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_firstrun_revisit.js index 02c2d94db9..998a7653c8 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_firstrun_revisit.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_firstrun_revisit.js @@ -21,13 +21,13 @@ add_task(async function test_translations_panel_firstrun() { "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); await FullPageTranslationsTestUtils.clickCancelButton(); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); @@ -37,7 +37,7 @@ add_task(async function test_translations_panel_firstrun() { url: SPANISH_PAGE_URL_DOT_ORG, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -47,7 +47,7 @@ add_task(async function test_translations_panel_firstrun() { url: SPANISH_PAGE_URL, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_fuzzing.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_fuzzing.js index 2f5285ac46..0accc3db60 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_fuzzing.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_fuzzing.js @@ -96,7 +96,7 @@ add_task(async function test_translations_panel_fuzzing() { { button: true }, "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -131,7 +131,7 @@ add_task(async function test_translations_panel_fuzzing() { hasVerifiedMutation ) { reportOperation("destroyEngineProcess"); - await TranslationsParent.destroyEngineProcess(); + await EngineProcess.destroyTranslationsEngine(); isEngineMaybeDestroyed = true; } return true; @@ -195,7 +195,7 @@ add_task(async function test_translations_panel_fuzzing() { async restoreSpanishPage() { if (activeTab === "spanish" && isSpanishPageTranslated) { reportOperation("restoreSpanishPage"); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_gear.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_gear.js index c24fc61e3d..0b9ce3ad3b 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_gear.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_gear.js @@ -12,7 +12,7 @@ add_task(async function test_translations_panel_manage_languages() { languagePairs: LANGUAGE_PAIRS, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_language.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_language.js index 6c1fea7754..52cab172e7 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_language.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_language.js @@ -21,7 +21,7 @@ add_task(async function test_toggle_never_translate_language_menuitem() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -69,7 +69,7 @@ add_task( await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -83,7 +83,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -125,7 +125,7 @@ add_task( "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -154,7 +154,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site.js index 858aa297df..9d64da5b38 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site.js @@ -22,7 +22,7 @@ add_task(async function test_toggle_never_translate_site_menuitem() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -82,7 +82,7 @@ add_task( await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -96,7 +96,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -161,7 +161,7 @@ add_task( "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -192,7 +192,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_auto.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_auto.js index 28f3b570c3..faa425c403 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_auto.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_auto.js @@ -23,7 +23,7 @@ add_task( "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -54,7 +54,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_basic.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_basic.js index 098ff54d6e..048e002f45 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_basic.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_basic.js @@ -22,7 +22,7 @@ add_task(async function test_toggle_never_translate_site_menuitem() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_manual.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_manual.js index d916342c33..425e202546 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_never_translate_site_manual.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_never_translate_site_manual.js @@ -24,7 +24,7 @@ add_task( await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -38,7 +38,7 @@ add_task( runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_retry.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_retry.js index 76a6bd9429..74d92381b9 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_retry.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_retry.js @@ -19,7 +19,7 @@ add_task(async function test_translations_panel_retry() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -33,7 +33,7 @@ add_task(async function test_translations_panel_retry() { runInPage ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); diff --git a/browser/components/translations/tests/browser/browser_translations_panel_settings_unsupported_lang.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_settings_unsupported_lang.js index 18fcf484dd..d371e9ed22 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_settings_unsupported_lang.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_settings_unsupported_lang.js @@ -26,7 +26,7 @@ add_task(async function test_unsupported_language_settings_menu_checkboxes() { "The translations button is visible." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -56,7 +56,7 @@ add_task(async function test_unsupported_language_settings_menu_checkboxes() { "The translations button should be unavailable." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewUnsupportedLanguage, diff --git a/browser/components/translations/tests/browser/browser_translations_panel_switch_languages.js b/browser/components/translations/tests/browser/browser_translations_full_page_panel_switch_languages.js index 3652c61d83..0c5db67b20 100644 --- a/browser/components/translations/tests/browser/browser_translations_panel_switch_languages.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_panel_switch_languages.js @@ -19,16 +19,16 @@ add_task(async function test_translations_panel_switch_language() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); - const { translateButton } = TranslationsPanel.elements; + const { translateButton } = FullPageTranslationsPanel.elements; ok(!translateButton.disabled, "The translate button starts as enabled"); - FullPageTranslationsTestUtils.assertSelectedFromLanguage("es"); - FullPageTranslationsTestUtils.assertSelectedToLanguage("en"); + FullPageTranslationsTestUtils.assertSelectedFromLanguage({ langTag: "es" }); + FullPageTranslationsTestUtils.assertSelectedToLanguage({ langTag: "en" }); FullPageTranslationsTestUtils.switchSelectedFromLanguage("en"); diff --git a/browser/components/translations/tests/browser/browser_translations_reader_mode.js b/browser/components/translations/tests/browser/browser_translations_full_page_reader_mode.js index d066257998..1a6ea9d2ec 100644 --- a/browser/components/translations/tests/browser/browser_translations_reader_mode.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_reader_mode.js @@ -72,7 +72,7 @@ add_task(async function test_translations_persist_in_reader_mode() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_auto_translate.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_auto_translate.js index abfc3dc32e..d26bcad77b 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_auto_translate.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_auto_translate.js @@ -21,7 +21,7 @@ add_task(async function test_translations_telemetry_firstrun_auto_translate() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -74,7 +74,7 @@ add_task(async function test_translations_telemetry_firstrun_auto_translate() { } ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_basics.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_basics.js index 200e06b9ce..db6d2e3b6c 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_basics.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_basics.js @@ -23,7 +23,7 @@ add_task(async function test_translations_telemetry_firstrun_basics() { "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); @@ -56,7 +56,7 @@ add_task(async function test_translations_telemetry_firstrun_basics() { expectFirstInteraction: true, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_translation_failure.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_translation_failure.js index 5397175039..75f58ab229 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_translation_failure.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_translation_failure.js @@ -25,7 +25,7 @@ add_task(async function test_translations_telemetry_firstrun_failure() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); @@ -113,7 +113,7 @@ add_task(async function test_translations_telemetry_firstrun_failure() { expectFirstInteraction: true, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewFirstShow, }); diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_unsupported_lang.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_unsupported_lang.js index fa9c67ee37..86ae21e9ed 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_firstrun_unsupported_lang.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_firstrun_unsupported_lang.js @@ -19,7 +19,7 @@ add_task( prefs: [["browser.translations.panelShown", false]], }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewUnsupportedLanguage, @@ -83,7 +83,7 @@ add_task( expectFirstInteraction: true, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ openFromAppMenu: true, onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewUnsupportedLanguage, diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_open_panel.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_open_panel.js index 64a02287e8..a49059f78f 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_open_panel.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_open_panel.js @@ -21,7 +21,7 @@ add_task(async function test_translations_telemetry_open_panel() { "The button is available." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -51,7 +51,7 @@ add_task(async function test_translations_telemetry_open_panel() { expectNewFlowId: false, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_panel_auto_offer.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_panel_auto_offer.js index 93ff473851..93ff473851 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_panel_auto_offer.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_panel_auto_offer.js diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_panel_auto_offer_settings.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_panel_auto_offer_settings.js index 9eae81904d..4a2959f58e 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_panel_auto_offer_settings.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_panel_auto_offer_settings.js @@ -24,7 +24,7 @@ add_task(async function test_translations_panel_auto_offer_settings() { expectedEventCount: 0, }); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.openTranslationsSettingsMenu(); @@ -54,7 +54,7 @@ add_task(async function test_translations_panel_auto_offer_settings() { } ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); await FullPageTranslationsTestUtils.assertIsAlwaysOfferTranslationsEnabled( diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_switch_languages.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_switch_languages.js index 6c06abab95..ef13940b3f 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_switch_languages.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_switch_languages.js @@ -19,11 +19,11 @@ add_task(async function test_translations_telemetry_switch_from_language() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); - FullPageTranslationsTestUtils.assertSelectedFromLanguage("es"); + FullPageTranslationsTestUtils.assertSelectedFromLanguage({ langTag: "es" }); FullPageTranslationsTestUtils.switchSelectedFromLanguage("en"); await TestTranslationsTelemetry.assertEvent(Glean.translationsPanel.open, { @@ -95,11 +95,11 @@ add_task(async function test_translations_telemetry_switch_to_language() { await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); - FullPageTranslationsTestUtils.assertSelectedToLanguage("en"); + FullPageTranslationsTestUtils.assertSelectedToLanguage({ langTag: "en" }); FullPageTranslationsTestUtils.switchSelectedToLanguage("fr"); await TestTranslationsTelemetry.assertEvent(Glean.translationsPanel.open, { diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_translation_failure.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_translation_failure.js index e7d0cfb4f4..7a9f58970a 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_translation_failure.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_translation_failure.js @@ -44,7 +44,7 @@ add_task( } ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_telemetry_translation_request.js b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_translation_request.js index 90bd81a8ed..e671f5e0da 100644 --- a/browser/components/translations/tests/browser/browser_translations_telemetry_translation_request.js +++ b/browser/components/translations/tests/browser/browser_translations_full_page_telemetry_translation_request.js @@ -39,7 +39,7 @@ add_task(async function test_translations_telemetry_manual_translation() { } ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); diff --git a/browser/components/translations/tests/browser/browser_translations_select_context_menu_with_full_page_translations_active.js b/browser/components/translations/tests/browser/browser_translations_select_context_menu_with_full_page_translations_active.js index 58cb655e38..99cff2b4ec 100644 --- a/browser/components/translations/tests/browser/browser_translations_select_context_menu_with_full_page_translations_active.js +++ b/browser/components/translations/tests/browser/browser_translations_select_context_menu_with_full_page_translations_active.js @@ -35,7 +35,7 @@ add_task( "The translate-selection context menu item should be available while full-page translations is inactive." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -59,7 +59,7 @@ add_task( "The translate-selection context menu item should be unavailable while full-page translations is active." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); @@ -114,7 +114,7 @@ add_task( "The translate-selection context menu item should be available while full-page translations is inactive." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault, }); @@ -138,7 +138,7 @@ add_task( "The translate-selection context menu item should be unavailable while full-page translations is active." ); - await FullPageTranslationsTestUtils.openTranslationsPanel({ + await FullPageTranslationsTestUtils.openPanel({ onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit, }); diff --git a/browser/components/translations/tests/browser/browser_translations_select_panel_language_selectors.js b/browser/components/translations/tests/browser/browser_translations_select_panel_language_selectors.js new file mode 100644 index 0000000000..1dcc76450f --- /dev/null +++ b/browser/components/translations/tests/browser/browser_translations_select_panel_language_selectors.js @@ -0,0 +1,54 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +add_task( + async function test_select_translations_panel_open_spanish_language_selectors() { + const { cleanup, runInPage } = await loadTestPage({ + page: SPANISH_PAGE_URL, + languagePairs: LANGUAGE_PAIRS, + prefs: [["browser.translations.select.enable", true]], + }); + + await SelectTranslationsTestUtils.openPanel(runInPage, { + selectSpanishParagraph: true, + openAtSpanishParagraph: true, + expectedTargetLanguage: "en", + onOpenPanel: SelectTranslationsTestUtils.assertPanelViewDefault, + }); + + SelectTranslationsTestUtils.assertSelectedFromLanguage({ langTag: "es" }); + SelectTranslationsTestUtils.assertSelectedToLanguage({ langTag: "en" }); + + await SelectTranslationsTestUtils.clickDoneButton(); + + await cleanup(); + } +); + +add_task( + async function test_select_translations_panel_open_english_language_selectors() { + const { cleanup, runInPage } = await loadTestPage({ + page: ENGLISH_PAGE_URL, + languagePairs: LANGUAGE_PAIRS, + prefs: [["browser.translations.select.enable", true]], + }); + + await SelectTranslationsTestUtils.openPanel(runInPage, { + selectFirstParagraph: true, + openAtFirstParagraph: true, + expectedTargetLanguage: "en", + onOpenPanel: SelectTranslationsTestUtils.assertPanelViewDefault, + }); + + SelectTranslationsTestUtils.assertSelectedFromLanguage({ langTag: "en" }); + SelectTranslationsTestUtils.assertSelectedToLanguage({ + l10nId: "translations-panel-choose-language", + }); + + await SelectTranslationsTestUtils.clickDoneButton(); + + await cleanup(); + } +); diff --git a/browser/components/translations/tests/browser/browser_translations_select_panel_mainview_ui.js b/browser/components/translations/tests/browser/browser_translations_select_panel_mainview_ui.js new file mode 100644 index 0000000000..79d21e57d0 --- /dev/null +++ b/browser/components/translations/tests/browser/browser_translations_select_panel_mainview_ui.js @@ -0,0 +1,36 @@ +/* Any copyright is dedicated to the Public Domain. + http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +/** + * This test case verifies the visibility and initial state of UI elements within the + * Select Translations Panel's main-view UI. + */ +add_task( + async function test_select_translations_panel_mainview_ui_element_visibility() { + const { cleanup, runInPage } = await loadTestPage({ + page: SPANISH_PAGE_URL, + languagePairs: LANGUAGE_PAIRS, + prefs: [["browser.translations.select.enable", true]], + }); + + await FullPageTranslationsTestUtils.assertTranslationsButton( + { button: true, circleArrows: false, locale: false, icon: true }, + "The button is available." + ); + + await FullPageTranslationsTestUtils.assertPageIsUntranslated(runInPage); + + await SelectTranslationsTestUtils.openPanel(runInPage, { + selectSpanishParagraph: true, + openAtSpanishParagraph: true, + expectedTargetLanguage: "es", + onOpenPanel: SelectTranslationsTestUtils.assertPanelViewDefault, + }); + + await SelectTranslationsTestUtils.clickDoneButton(); + + await cleanup(); + } +); diff --git a/browser/components/translations/tests/browser/head.js b/browser/components/translations/tests/browser/head.js index bc9968308c..200ed08719 100644 --- a/browser/components/translations/tests/browser/head.js +++ b/browser/components/translations/tests/browser/head.js @@ -206,7 +206,7 @@ async function navigate( // it doesn't close on navigate the way that it does when it's // open from the translations button, so ensure that we always // close it when we navigate to a new page. - await closeTranslationsPanelIfOpen(); + await closeAllOpenPanelsAndMenus(); info(message); @@ -230,7 +230,7 @@ async function navigate( info(`Loading url: "${url}"`); if (onOpenPanel) { - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popupshown", loadTargetPage, onOpenPanel @@ -277,6 +277,146 @@ async function toggleReaderMode() { } /** + * A collection of shared functionality utilized by + * FullPageTranslationsTestUtils and SelectTranslationsTestUtils. + * + * Using functions from the aforementioned classes is preferred over + * using functions from this class directly. + */ +class SharedTranslationsTestUtils { + /** + * Asserts that the mainViewId of the panel matches the given string. + * + * @param {FullPageTranslationsPanel | SelectTranslationsPanel} panel + * @param {string} expectedId - The expected id that mainViewId is set to. + */ + static _assertPanelMainViewId(panel, expectedId) { + const mainViewId = panel.elements.multiview.getAttribute("mainViewId"); + is( + mainViewId, + expectedId, + "The mainViewId should match its expected value" + ); + } + + /** + * Asserts that the selected from-language matches the provided arguments. + * + * @param {FullPageTranslationsPanel | SelectTranslationsPanel} panel + * - The UI component or panel whose selected from-language is being asserted. + * @param {object} options - An object containing assertion parameters. + * @param {string} [options.langTag] - A BCP-47 language tag. + * @param {string} [options.l10nId] - A localization identifier. + */ + static _assertSelectedFromLanguage(panel, { langTag, l10nId }) { + const { fromMenuList } = panel.elements; + is( + fromMenuList.value, + langTag, + "Expected selected from-language to match the given language tag" + ); + if (l10nId) { + is( + fromMenuList.getAttribute("data-l10n-id"), + l10nId, + "Expected selected from-language to match the given l10n id" + ); + } + } + + /** + * Asserts that the selected to-language matches the provided arguments. + * + * @param {FullPageTranslationsPanel | SelectTranslationsPanel} panel + * - The UI component or panel whose selected from-language is being asserted. + * @param {object} options - An object containing assertion parameters. + * @param {string} [options.langTag] - A BCP-47 language tag. + * @param {string} [options.l10nId] - A localization identifier. + */ + static _assertSelectedToLanguage(panel, { langTag, l10nId }) { + const { toMenuList } = panel.elements; + if (langTag) { + is( + toMenuList.value, + langTag, + "Expected selected to-language to match the given language tag" + ); + } + if (l10nId) { + is( + toMenuList.getAttribute("data-l10n-id"), + l10nId, + "Expected selected to-language to match the given l10n id" + ); + } + } + + /** + * Asserts the visibility of the given elements based on the given expectations. + * + * @param {object} elements - An object containing the elements to be checked for visibility. + * @param {object} expectations - An object where each property corresponds to a property in elements, + * and its value is a boolean indicating whether the element should + * be visible (true) or hidden (false). + * @throws Throws if elements does not contain a property for each property in expectations. + */ + static _assertPanelElementVisibility(elements, expectations) { + const hidden = {}; + const visible = {}; + + for (const propertyName in expectations) { + ok( + elements.hasOwnProperty(propertyName), + `Expected panel elements to have property ${propertyName}` + ); + if (expectations[propertyName]) { + visible[propertyName] = elements[propertyName]; + } else { + hidden[propertyName] = elements[propertyName]; + } + } + + assertVisibility({ hidden, visible }); + } + + /** + * Executes the provided callback before waiting for the event and then waits for the given event + * to be fired for the element corresponding to the provided elementId. + * + * Optionally executes a postEventAssertion function once the event occurs. + * + * @param {string} elementId - The Id of the element to wait for the event on. + * @param {string} eventName - The name of the event to wait for. + * @param {Function} callback - A callback function to execute immediately before waiting for the event. + * This is often used to trigger the event on the expected element. + * @param {Function|null} [postEventAssertion=null] - An optional callback function to execute after + * the event has occurred. + * @throws Throws if the element with the specified `elementId` does not exist. + * @returns {Promise<void>} + */ + static async _waitForPopupEvent( + elementId, + eventName, + callback, + postEventAssertion = null + ) { + const element = document.getElementById(elementId); + if (!element) { + throw new Error("Unable to find the translations panel element."); + } + const promise = BrowserTestUtils.waitForEvent(element, eventName); + await callback(); + info("Waiting for the translations panel popup to be shown"); + await promise; + if (postEventAssertion) { + postEventAssertion(); + } + // Wait a single tick on the event loop. + await new Promise(resolve => setTimeout(resolve, 0)); + } +} + +/** * A class containing test utility functions specific to testing full-page translations. */ class FullPageTranslationsTestUtils { @@ -515,61 +655,45 @@ class FullPageTranslationsTestUtils { /** * Asserts that for each provided expectation, the visible state of the corresponding - * element in TranslationsPanel.elements both exists and matches the visibility expectation. + * element in FullPageTranslationsPanel.elements both exists and matches the visibility expectation. * * @param {object} expectations - * A list of expectations for the visibility of any subset of TranslationsPanel.elements + * A list of expectations for the visibility of any subset of FullPageTranslationsPanel.elements */ static #assertPanelElementVisibility(expectations = {}) { - // Assume nothing is visible by default, and overwrite them - // with any specific expectations provided in the argument. - const finalExpectations = { - cancelButton: false, - changeSourceLanguageButton: false, - dismissErrorButton: false, - error: false, - fromMenuList: false, - fromLabel: false, - header: false, - intro: false, - introLearnMoreLink: false, - langSelection: false, - restoreButton: false, - toLabel: false, - toMenuList: false, - translateButton: false, - unsupportedHeader: false, - unsupportedHint: false, - unsupportedLearnMoreLink: false, - ...expectations, - }; - - const elements = TranslationsPanel.elements; - const hidden = {}; - const visible = {}; - - for (const propertyName in finalExpectations) { - ok( - elements.hasOwnProperty(propertyName), - `Expected translations panel elements to have property ${propertyName}` - ); - if (finalExpectations[propertyName]) { - visible[propertyName] = elements[propertyName]; - } else { - hidden[propertyName] = elements[propertyName]; + SharedTranslationsTestUtils._assertPanelElementVisibility( + FullPageTranslationsPanel.elements, + { + cancelButton: false, + changeSourceLanguageButton: false, + dismissErrorButton: false, + error: false, + fromMenuList: false, + fromLabel: false, + header: false, + intro: false, + introLearnMoreLink: false, + langSelection: false, + restoreButton: false, + toLabel: false, + toMenuList: false, + translateButton: false, + unsupportedHeader: false, + unsupportedHint: false, + unsupportedLearnMoreLink: false, + // Overwrite any of the above defaults with the passed in expectations. + ...expectations, } - } - - assertVisibility({ hidden, visible }); + ); } /** - * Asserts that the TranslationsPanel header has the expected l10nId. + * Asserts that the FullPageTranslationsPanel header has the expected l10nId. * * @param {string} l10nId - The expected data-l10n-id of the header. */ static #assertPanelHeaderL10nId(l10nId) { - const { header } = TranslationsPanel.elements; + const { header } = FullPageTranslationsPanel.elements; is( header.getAttribute("data-l10n-id"), l10nId, @@ -578,17 +702,28 @@ class FullPageTranslationsTestUtils { } /** + * Asserts that the FullPageTranslationsPanel error has the expected l10nId. + * + * @param {string} l10nId - The expected data-l10n-id of the error. + */ + static #assertPanelErrorL10nId(l10nId) { + const { errorMessage } = FullPageTranslationsPanel.elements; + is( + errorMessage.getAttribute("data-l10n-id"), + l10nId, + "The translations panel error message should match the expected data-l10n-id" + ); + } + + /** * Asserts that the mainViewId of the panel matches the given string. * * @param {string} expectedId */ static #assertPanelMainViewId(expectedId) { - const mainViewId = - TranslationsPanel.elements.multiview.getAttribute("mainViewId"); - is( - mainViewId, - expectedId, - "The full-page Translations panel mainViewId should match its expected value" + SharedTranslationsTestUtils._assertPanelMainViewId( + FullPageTranslationsPanel, + expectedId ); } @@ -598,7 +733,7 @@ class FullPageTranslationsTestUtils { static assertPanelViewDefault() { info("Checking that the panel shows the default view"); FullPageTranslationsTestUtils.#assertPanelMainViewId( - "translations-panel-view-default" + "full-page-translations-panel-view-default" ); FullPageTranslationsTestUtils.#assertPanelElementVisibility({ ...FullPageTranslationsTestUtils.#defaultViewVisibilityExpectations, @@ -614,7 +749,7 @@ class FullPageTranslationsTestUtils { static assertPanelViewError() { info("Checking that the panel shows the error view"); FullPageTranslationsTestUtils.#assertPanelMainViewId( - "translations-panel-view-default" + "full-page-translations-panel-view-default" ); FullPageTranslationsTestUtils.#assertPanelElementVisibility({ error: true, @@ -623,6 +758,9 @@ class FullPageTranslationsTestUtils { FullPageTranslationsTestUtils.#assertPanelHeaderL10nId( "translations-panel-header" ); + FullPageTranslationsTestUtils.#assertPanelErrorL10nId( + "translations-panel-error-translating" + ); } /** @@ -644,7 +782,7 @@ class FullPageTranslationsTestUtils { static assertPanelViewFirstShow() { info("Checking that the panel shows the first-show view"); FullPageTranslationsTestUtils.#assertPanelMainViewId( - "translations-panel-view-default" + "full-page-translations-panel-view-default" ); FullPageTranslationsTestUtils.#assertPanelElementVisibility({ intro: true, @@ -662,7 +800,7 @@ class FullPageTranslationsTestUtils { static assertPanelViewFirstShowError() { info("Checking that the panel shows the first-show error view"); FullPageTranslationsTestUtils.#assertPanelMainViewId( - "translations-panel-view-default" + "full-page-translations-panel-view-default" ); FullPageTranslationsTestUtils.#assertPanelElementVisibility({ error: true, @@ -681,7 +819,7 @@ class FullPageTranslationsTestUtils { static assertPanelViewRevisit() { info("Checking that the panel shows the revisit view"); FullPageTranslationsTestUtils.#assertPanelMainViewId( - "translations-panel-view-default" + "full-page-translations-panel-view-default" ); FullPageTranslationsTestUtils.#assertPanelElementVisibility({ header: true, @@ -702,7 +840,7 @@ class FullPageTranslationsTestUtils { static assertPanelViewUnsupportedLanguage() { info("Checking that the panel shows the unsupported-language view"); FullPageTranslationsTestUtils.#assertPanelMainViewId( - "translations-panel-view-unsupported-language" + "full-page-translations-panel-view-unsupported-language" ); FullPageTranslationsTestUtils.#assertPanelElementVisibility({ changeSourceLanguageButton: true, @@ -718,13 +856,10 @@ class FullPageTranslationsTestUtils { * * @param {string} langTag - A BCP-47 language tag. */ - static assertSelectedFromLanguage(langTag) { - info(`Checking that the selected from-language matches ${langTag}`); - const { fromMenuList } = TranslationsPanel.elements; - is( - fromMenuList.value, - langTag, - "Expected selected from-language to match the given language tag" + static assertSelectedFromLanguage({ langTag, l10nId }) { + SharedTranslationsTestUtils._assertSelectedFromLanguage( + FullPageTranslationsPanel, + { langTag, l10nId } ); } @@ -733,13 +868,10 @@ class FullPageTranslationsTestUtils { * * @param {string} langTag - A BCP-47 language tag. */ - static assertSelectedToLanguage(langTag) { - info(`Checking that the selected to-language matches ${langTag}`); - const { toMenuList } = TranslationsPanel.elements; - is( - toMenuList.value, - langTag, - "Expected selected to-language to match the given language tag" + static assertSelectedToLanguage({ langTag, l10nId }) { + SharedTranslationsTestUtils._assertSelectedToLanguage( + FullPageTranslationsPanel, + { langTag, l10nId } ); } @@ -827,9 +959,9 @@ class FullPageTranslationsTestUtils { */ static async clickCancelButton() { logAction(); - const { cancelButton } = TranslationsPanel.elements; + const { cancelButton } = FullPageTranslationsPanel.elements; assertVisibility({ visible: { cancelButton } }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", () => { click(cancelButton, "Clicking the cancel button"); @@ -847,9 +979,9 @@ class FullPageTranslationsTestUtils { */ static async clickChangeSourceLanguageButton({ firstShow = false } = {}) { logAction(); - const { changeSourceLanguageButton } = TranslationsPanel.elements; + const { changeSourceLanguageButton } = FullPageTranslationsPanel.elements; assertVisibility({ visible: { changeSourceLanguageButton } }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popupshown", () => { click( @@ -868,9 +1000,9 @@ class FullPageTranslationsTestUtils { */ static async clickDismissErrorButton() { logAction(); - const { dismissErrorButton } = TranslationsPanel.elements; + const { dismissErrorButton } = FullPageTranslationsPanel.elements; assertVisibility({ visible: { dismissErrorButton } }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", () => { click(dismissErrorButton, "Click the dismiss-error button"); @@ -919,9 +1051,9 @@ class FullPageTranslationsTestUtils { */ static async clickRestoreButton() { logAction(); - const { restoreButton } = TranslationsPanel.elements; + const { restoreButton } = FullPageTranslationsPanel.elements; assertVisibility({ visible: { restoreButton } }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", () => { click(restoreButton, "Click the restore-page button"); @@ -957,9 +1089,9 @@ class FullPageTranslationsTestUtils { pivotTranslation = false, } = {}) { logAction(); - const { translateButton } = TranslationsPanel.elements; + const { translateButton } = FullPageTranslationsPanel.elements; assertVisibility({ visible: { translateButton } }); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popuphidden", () => { click(translateButton); @@ -986,25 +1118,23 @@ class FullPageTranslationsTestUtils { * @param {boolean} config.openWithKeyboard * - Open the panel by synthesizing the keyboard. If false, synthesizes the mouse. */ - static async openTranslationsPanel({ + static async openPanel({ onOpenPanel = null, openFromAppMenu = false, openWithKeyboard = false, }) { logAction(); - await closeTranslationsPanelIfOpen(); + await closeAllOpenPanelsAndMenus(); if (openFromAppMenu) { - await FullPageTranslationsTestUtils.#openTranslationsPanelViaAppMenu({ + await FullPageTranslationsTestUtils.#openPanelViaAppMenu({ onOpenPanel, openWithKeyboard, }); } else { - await FullPageTranslationsTestUtils.#openTranslationsPanelViaTranslationsButton( - { - onOpenPanel, - openWithKeyboard, - } - ); + await FullPageTranslationsTestUtils.#openPanelViaTranslationsButton({ + onOpenPanel, + openWithKeyboard, + }); } } @@ -1017,7 +1147,7 @@ class FullPageTranslationsTestUtils { * @param {boolean} config.openWithKeyboard * - Open the panel by synthesizing the keyboard. If false, synthesizes the mouse. */ - static async #openTranslationsPanelViaAppMenu({ + static async #openPanelViaAppMenu({ onOpenPanel = null, openWithKeyboard = false, }) { @@ -1038,7 +1168,7 @@ class FullPageTranslationsTestUtils { "The app-menu translate button should be enabled" ); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popupshown", () => { if (openWithKeyboard) { @@ -1060,7 +1190,7 @@ class FullPageTranslationsTestUtils { * @param {boolean} config.openWithKeyboard * - Open the panel by synthesizing the keyboard. If false, synthesizes the mouse. */ - static async #openTranslationsPanelViaTranslationsButton({ + static async #openPanelViaTranslationsButton({ onOpenPanel = null, openWithKeyboard = false, }) { @@ -1070,7 +1200,7 @@ class FullPageTranslationsTestUtils { { button: true }, "The translations button is visible." ); - await FullPageTranslationsTestUtils.waitForTranslationsPopupEvent( + await FullPageTranslationsTestUtils.waitForPanelPopupEvent( "popupshown", () => { if (openWithKeyboard) { @@ -1091,7 +1221,7 @@ class FullPageTranslationsTestUtils { logAction(); const gearIcons = getAllByL10nId("translations-panel-settings-button"); for (const gearIcon of gearIcons) { - if (gearIcon.hidden) { + if (BrowserTestUtils.isHidden(gearIcon)) { continue; } click(gearIcon, "Open the settings menu"); @@ -1114,7 +1244,7 @@ class FullPageTranslationsTestUtils { */ static switchSelectedFromLanguage(langTag) { logAction(langTag); - const { fromMenuList } = TranslationsPanel.elements; + const { fromMenuList } = FullPageTranslationsPanel.elements; fromMenuList.value = langTag; fromMenuList.dispatchEvent(new Event("command")); } @@ -1126,7 +1256,7 @@ class FullPageTranslationsTestUtils { */ static switchSelectedToLanguage(langTag) { logAction(langTag); - const { toMenuList } = TranslationsPanel.elements; + const { toMenuList } = FullPageTranslationsPanel.elements; toMenuList.value = langTag; toMenuList.dispatchEvent(new Event("command")); } @@ -1142,26 +1272,19 @@ class FullPageTranslationsTestUtils { * An optional assertion to be made immediately after the event occurs. * @returns {Promise<void>} */ - static async waitForTranslationsPopupEvent( + static async waitForPanelPopupEvent( eventName, callback, postEventAssertion = null ) { // De-lazify the panel elements. - TranslationsPanel.elements; - const panel = document.getElementById("translations-panel"); - if (!panel) { - throw new Error("Unable to find the translations panel element."); - } - const promise = BrowserTestUtils.waitForEvent(panel, eventName); - await callback(); - info("Waiting for the translations panel popup to be shown"); - await promise; - if (postEventAssertion) { - postEventAssertion(); - } - // Wait a single tick on the event loop. - await new Promise(resolve => setTimeout(resolve, 0)); + FullPageTranslationsPanel.elements; + await SharedTranslationsTestUtils._waitForPopupEvent( + "full-page-translations-panel", + eventName, + callback, + postEventAssertion + ); } } @@ -1210,8 +1333,7 @@ class SelectTranslationsTestUtils { info(message); } - await closeTranslationsPanelIfOpen(); - await closeContextMenuIfOpen(); + await closeAllOpenPanelsAndMenus(); await SelectTranslationsTestUtils.openContextMenu(runInPage, { selectFirstParagraph, @@ -1274,8 +1396,106 @@ class SelectTranslationsTestUtils { ); } } + } + + /** + * Asserts that for each provided expectation, the visible state of the corresponding + * element in FullPageTranslationsPanel.elements both exists and matches the visibility expectation. + * + * @param {object} expectations + * A list of expectations for the visibility of any subset of SelectTranslationsPanel.elements + */ + static #assertPanelElementVisibility(expectations = {}) { + SharedTranslationsTestUtils._assertPanelElementVisibility( + SelectTranslationsPanel.elements, + { + betaIcon: false, + copyButton: false, + doneButton: false, + fromLabel: false, + fromMenuList: false, + header: false, + textArea: false, + toLabel: false, + toMenuList: false, + translateFullPageButton: false, + // Overwrite any of the above defaults with the passed in expectations. + ...expectations, + } + ); + } - await closeContextMenuIfOpen(); + /** + * Asserts that the mainViewId of the panel matches the given string. + * + * @param {string} expectedId + */ + static #assertPanelMainViewId(expectedId) { + SharedTranslationsTestUtils._assertPanelMainViewId( + SelectTranslationsPanel, + expectedId + ); + } + + /** + * Asserts that panel element visibility matches the default panel view. + */ + static assertPanelViewDefault() { + info("Checking that the select-translations panel shows the default view"); + SelectTranslationsTestUtils.#assertPanelMainViewId( + "select-translations-panel-view-default" + ); + SelectTranslationsTestUtils.#assertPanelElementVisibility({ + betaIcon: true, + fromLabel: true, + fromMenuList: true, + header: true, + textArea: true, + toLabel: true, + toMenuList: true, + copyButton: true, + doneButton: true, + translateFullPageButton: true, + }); + } + + /** + * Asserts that the selected from-language matches the provided language tag. + * + * @param {string} langTag - A BCP-47 language tag. + */ + static assertSelectedFromLanguage({ langTag, l10nId }) { + SharedTranslationsTestUtils._assertSelectedFromLanguage( + SelectTranslationsPanel, + { langTag, l10nId } + ); + } + + /** + * Asserts that the selected to-language matches the provided language tag. + * + * @param {string} langTag - A BCP-47 language tag. + */ + static assertSelectedToLanguage({ langTag, l10nId }) { + SharedTranslationsTestUtils._assertSelectedToLanguage( + SelectTranslationsPanel, + { langTag, l10nId } + ); + } + + /** + * Simulates clicking the done button and waits for the panel to close. + */ + static async clickDoneButton() { + logAction(); + const { doneButton } = SelectTranslationsPanel.elements; + assertVisibility({ visible: { doneButton } }); + await SelectTranslationsTestUtils.waitForPanelPopupEvent( + "popuphidden", + () => { + click(doneButton, "Clicking the done button"); + } + ); } /** @@ -1325,38 +1545,62 @@ class SelectTranslationsTestUtils { } if (openAtFirstParagraph === true) { - await runInPage(async TranslationsTest => { - const { getFirstParagraph } = TranslationsTest.getSelectors(); - const paragraph = getFirstParagraph(); - await TranslationsTest.rightClickContentElement(paragraph); - }); + await SharedTranslationsTestUtils._waitForPopupEvent( + "contentAreaContextMenu", + "popupshown", + async () => { + await runInPage(async TranslationsTest => { + const { getFirstParagraph } = TranslationsTest.getSelectors(); + const paragraph = getFirstParagraph(); + await TranslationsTest.rightClickContentElement(paragraph); + }); + } + ); return; } if (openAtSpanishParagraph === true) { - await runInPage(async TranslationsTest => { - const { getSpanishParagraph } = TranslationsTest.getSelectors(); - const paragraph = getSpanishParagraph(); - await TranslationsTest.rightClickContentElement(paragraph); - }); + await SharedTranslationsTestUtils._waitForPopupEvent( + "contentAreaContextMenu", + "popupshown", + async () => { + await runInPage(async TranslationsTest => { + const { getSpanishParagraph } = TranslationsTest.getSelectors(); + const paragraph = getSpanishParagraph(); + await TranslationsTest.rightClickContentElement(paragraph); + }); + } + ); return; } if (openAtEnglishHyperlink === true) { - await runInPage(async TranslationsTest => { - const { getEnglishHyperlink } = TranslationsTest.getSelectors(); - const hyperlink = getEnglishHyperlink(); - await TranslationsTest.rightClickContentElement(hyperlink); - }); + await SharedTranslationsTestUtils._waitForPopupEvent( + "contentAreaContextMenu", + "popupshown", + async () => { + await runInPage(async TranslationsTest => { + const { getEnglishHyperlink } = TranslationsTest.getSelectors(); + const hyperlink = getEnglishHyperlink(); + await TranslationsTest.rightClickContentElement(hyperlink); + }); + } + ); return; } if (openAtSpanishHyperlink === true) { - await runInPage(async TranslationsTest => { - const { getSpanishHyperlink } = TranslationsTest.getSelectors(); - const hyperlink = getSpanishHyperlink(); - await TranslationsTest.rightClickContentElement(hyperlink); - }); + await SharedTranslationsTestUtils._waitForPopupEvent( + "contentAreaContextMenu", + "popupshown", + async () => { + await runInPage(async TranslationsTest => { + const { getSpanishHyperlink } = TranslationsTest.getSelectors(); + const hyperlink = getSpanishHyperlink(); + await TranslationsTest.rightClickContentElement(hyperlink); + }); + } + ); return; } @@ -1364,6 +1608,96 @@ class SelectTranslationsTestUtils { "openContextMenu() was not provided a declaration for which element to open the menu at." ); } + + /** + * Opens the Select Translations panel via the context menu based on specified options. + * + * @param {Function} runInPage - A content-exposed function to run within the context of the page. + * @param {object} options - Options for selecting paragraphs and opening the context menu. + * @param {boolean} options.selectFirstParagraph - Selects the first paragraph before opening the context menu. + * @param {boolean} options.selectSpanishParagraph - Selects the Spanish paragraph before opening the context menu. + * This is only available in SPANISH_TEST_PAGE. + * @param {string} options.expectedTargetLanguage - The target language for translation. + * @param {boolean} options.openAtFirstParagraph - Opens the context menu at the first paragraph. + * @param {boolean} options.openAtSpanishParagraph - Opens at the Spanish paragraph. + * This is only available in SPANISH_TEST_PAGE. + * @param {boolean} options.openAtEnglishHyperlink - Opens at the English hyperlink. + * This is only available in SPANISH_TEST_PAGE. + * @param {boolean} options.openAtSpanishHyperlink - Opens at the Spanish hyperlink. + * This is only available in SPANISH_TEST_PAGE. + * @param {Function|null} [options.onOpenPanel=null] - An optional callback function to execute after the panel opens. + * @param {string|null} [message=null] - An optional message to log to info. + * @throws Throws an error if the context menu could not be opened with the provided options. + * @returns {Promise<void>} + */ + static async openPanel( + runInPage, + { + selectFirstParagraph, + selectSpanishParagraph, + expectedTargetLanguage, + openAtFirstParagraph, + openAtSpanishParagraph, + openAtEnglishHyperlink, + openAtSpanishHyperlink, + onOpenPanel, + }, + message + ) { + logAction(); + + if (message) { + info(message); + } + + await SelectTranslationsTestUtils.assertContextMenuTranslateSelectionItem( + runInPage, + { + selectFirstParagraph, + selectSpanishParagraph, + expectedTargetLanguage, + openAtFirstParagraph, + openAtSpanishParagraph, + openAtEnglishHyperlink, + openAtSpanishHyperlink, + }, + message + ); + + const menuItem = getById("context-translate-selection"); + + await SelectTranslationsTestUtils.waitForPanelPopupEvent( + "popupshown", + () => click(menuItem), + onOpenPanel + ); + } + + /** + * XUL popups will fire the popupshown and popuphidden events. These will fire for + * any type of popup in the browser. This function waits for one of those events, and + * checks that the viewId of the popup is PanelUI-profiler + * + * @param {"popupshown" | "popuphidden"} eventName + * @param {Function} callback + * @param {Function} postEventAssertion + * An optional assertion to be made immediately after the event occurs. + * @returns {Promise<void>} + */ + static async waitForPanelPopupEvent( + eventName, + callback, + postEventAssertion = null + ) { + // De-lazify the panel elements. + SelectTranslationsPanel.elements; + await SharedTranslationsTestUtils._waitForPopupEvent( + "select-translations-panel", + eventName, + callback, + postEventAssertion + ); + } } class TranslationsSettingsTestUtils { |