diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml index 7596a1f0a..7f747fc15 100644 --- a/.github/workflows/l10n.yml +++ b/.github/workflows/l10n.yml @@ -207,8 +207,10 @@ jobs: shell: pwsh - name: Download Executable if: ${{ inputs.win_installer_link }} + env: + WIN_INSTALLER_LINK: ${{ inputs.win_installer_link }} run: | - Invoke-WebRequest -Uri ${{ inputs.win_installer_link }} -OutFile "${{ github.workspace }}\setup.exe" + Invoke-WebRequest -Uri $WIN_INSTALLER_LINK -OutFile "${{ github.workspace }}\setup.exe" New-Item -ItemType Directory -Path "C:\Program Files\Custom Firefox" -Force shell: pwsh - name: Install Beta diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f41459f3c..60bbe86cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,9 +99,11 @@ jobs: shell: pwsh - name: Download Executable if: ${{ inputs.win_installer_link }} + env: + WIN_INSTALLER_LINK: ${{ inputs.win_installer_link }} run: | - echo "STARFOX_SPLIT=ci-extended" | Out-File -FilePath .env -Encoding utf8 -Append -Force - Invoke-WebRequest -Uri ${{ inputs.win_installer_link }} -OutFile "${{ github.workspace }}\setup.exe" + echo "STARFOX_SPLIT=smoke" | Out-File -FilePath .env -Encoding utf8 -Append -Force + Invoke-WebRequest -Uri $WIN_INSTALLER_LINK -OutFile "${{ github.workspace }}\setup.exe" New-Item -ItemType Directory -Path "C:\Program Files\Custom Firefox" -Force shell: pwsh - name: Install Beta @@ -179,7 +181,7 @@ jobs: if: ${{ inputs.mac_installer_link }} run: | echo "MANUAL='true'" >> "$GITHUB_ENV"; - echo "STARFOX_SPLIT=ci-extended" >> .env + echo "STARFOX_SPLIT=smoke" >> .env echo "Running smoke tests on supplied executable"; - name: Install dependencies run: | @@ -243,7 +245,7 @@ jobs: MANUAL_DOWNLOAD_LINK: ${{ inputs.linux_tarball_link }} run: | echo "MANUAL='true'" >> "$GITHUB_ENV"; - echo "STARFOX_SPLIT=ci-extended" >> "$GITHUB_ENV" + echo "STARFOX_SPLIT=smoke" >> "$GITHUB_ENV" echo "Running smoke tests on supplied executable"; sudo apt install gnome-screenshot uname -m; diff --git a/choose_ci_set.py b/choose_ci_set.py index 082aecff1..64c7f359f 100644 --- a/choose_ci_set.py +++ b/choose_ci_set.py @@ -214,8 +214,7 @@ def dedupe(run_list: list) -> list: fh.write("\n".join(ci_paths)) sys.exit(0) - if len(run_list) < MIN_RUN_SIZE: - run_list.extend(ci_paths) + run_list.extend(ci_paths) # Dedupe just in case if SLASH == "\\": diff --git a/manifests/key.yaml b/manifests/key.yaml index 2853ff1d8..6a4a89808 100644 --- a/manifests/key.yaml +++ b/manifests/key.yaml @@ -5,7 +5,7 @@ address_bar_and_search: mac: unstable win: pass splits: - - smoke + - functional1 test_adaptive_history_removal: result: pass splits: @@ -14,16 +14,14 @@ address_bar_and_search: result: pass splits: - smoke - - ci-extended test_added_open_search_engine_default: - result: pass + result: unstable splits: - functional1 test_addon_suggestion: result: unstable splits: - - smoke - - ci-extended + - functional1 test_addressbar_bookmarks_when_history_disabled: result: pass splits: @@ -33,11 +31,11 @@ address_bar_and_search: splits: - functional1 test_bing_search_codes: - result: pass + result: unstable splits: - functional1 test_clipboard_pref_flip: - result: pass + result: unstable splits: - functional1 test_copied_url_contains_https: @@ -55,13 +53,11 @@ address_bar_and_search: test_default_search_provider_change_awesome_bar: result: unstable splits: - - smoke - - ci - - ci-extended + - functional1 test_default_search_provider_change_legacy_search_bar: result: deprecated splits: - - smoke + - functional1 test_delete_history_entry_via_firefox_suggest_completion_list: result: pass splits: @@ -80,27 +76,25 @@ address_bar_and_search: mac: unstable win: pass splits: - - smoke - - ci-extended + - functional1 test_google_withads_url_bar_us: result: unstable splits: - - smoke - - ci-extended + - functional1 test_insertion_point_no_search_terms_display: result: pass splits: - functional1 test_no_suggestions_for_empty_query: - result: pass + result: unstable splits: - functional1 test_non_sponsored_topsite_context_menu_option: - result: pass + result: unstable splits: - functional1 test_open_link_in_new_container_tab: - result: pass + result: unstable splits: - functional1 test_paste_and_go_opens_correct_url: @@ -114,8 +108,7 @@ address_bar_and_search: test_sap_google_adclick: result: unstable splits: - - smoke - - ci-extended + - functional1 test_seach_suggestions_can_be_disabled: result: pass splits: @@ -124,19 +117,16 @@ address_bar_and_search: result: pass splits: - smoke - - ci-extended test_search_code_google_us: result: pass splits: - smoke - - ci-extended test_search_engine_selector: result: pass splits: - smoke - - ci-extended test_search_mode_appears_after_input: - result: pass + result: unstable splits: - functional1 test_search_mode_exits_correctly: @@ -150,7 +140,7 @@ address_bar_and_search: test_search_modes_for_sites: result: unstable splits: - - smoke + - functional1 test_search_string_displayed_when_addressbar_unfocused: result: pass splits: @@ -159,12 +149,10 @@ address_bar_and_search: result: unstable splits: - smoke - - ci-extended test_search_term_persists: result: unstable splits: - functional1 - - ci-extended test_searchbar_display_alpenglow_theme: result: pass splits: @@ -174,7 +162,7 @@ address_bar_and_search: splits: - functional1 test_searchbar_results_shown_in_a_new_tab: - result: pass + result: unstable splits: - functional1 test_searchmode_change_tab: @@ -193,7 +181,6 @@ address_bar_and_search: result: pass splits: - functional1 - - ci-extended test_server_not_found_error_pb: result: pass splits: @@ -201,14 +188,13 @@ address_bar_and_search: test_suggestion_engine_selection: result: pass splits: - - smoke - - ci-extended + - functional1 test_switch_to_existing_tab_when_having_the_same_URL: result: pass splits: - functional1 test_tile_menu_options: - result: pass + result: unstable splits: - functional1 test_use_different_search_shortcut_while_already_in_search_mode: @@ -226,134 +212,116 @@ audio_video: mac: pass win: unstable splits: - - smoke - - ci-extended + - functional1 test_block_audio_video_functionality: result: pass splits: - smoke - - ci-extended test_users_actions_saved_on_reload: result: pass splits: - - smoke - - ci-extended + - functional1 bookmarks_and_history: test_add_new_other_bookmark: result: pass splits: - - smoke - - ci-extended + - functional1 test_bookmark_via_bookmark_menu: result: pass splits: - - smoke - - ci-extended + - functional1 test_bookmark_website_via_star_button: result: pass splits: - smoke - ci - - ci-extended test_clear_all_history: result: pass splits: - smoke - - ci-extended test_clear_recent_history_displayed: result: pass splits: - - smoke - - ci-extended + - functional1 test_delete_bookmarks_from_toolbar: result: pass splits: - - smoke - - ci-extended + - functional1 test_delete_other_bookmarks: result: pass splits: - - smoke - - ci-extended + - functional1 test_deleted_page_not_remembered: result: pass splits: - - smoke - - ci-extended + - functional1 test_edit_bookmark_from_bookmark_menu: result: pass splits: - - smoke + - functional1 test_edit_bookmark_via_star_button: result: pass splits: - - smoke + - functional1 test_history_menu_from_different_places: result: pass splits: - - smoke + - functional1 test_import_bookmarks_chrome: - result: pass + result: unstable splits: - smoke test_import_bookmarks_edge: result: linux: unstable mac: unstable - win: pass + win: unstable splits: - smoke test_open_all_bookmarks_from_bookmarks_toolbar: result: pass splits: - - smoke + - functional1 test_open_bookmark_in_new_window_via_toolbar_context_menu: result: pass splits: - - smoke - - ci-extended + - functional1 test_open_bookmark_in_private_window_via_toolbar_context_menu: result: pass splits: - - smoke - - ci-extended + - functional1 test_open_bookmarks_from_toolbar: result: pass splits: - smoke - - ci-extended test_open_websites_from_history: result: pass splits: - smoke - - ci-extended test_opened_website_in_new_tab_present_in_hamburger_history_menu: result: pass splits: - - smoke + - functional1 test_opened_website_in_new_window_present_in_hamburger_history_menu: result: pass splits: - - smoke + - functional1 test_opened_website_present_in_hamburger_history_menu: result: pass splits: - - smoke + - functional1 test_private_window_website_not_in_history: result: pass splits: - - smoke - - ci-extended + - functional1 test_toggle_bookmarks_toolbar: result: pass splits: - - smoke - - ci-extended + - functional1 test_user_can_forget_history: result: pass splits: - - smoke - - ci-extended + - functional1 downloads: test_add_mime_type_doc: result: @@ -361,171 +329,145 @@ downloads: mac: pass win: unstable splits: - - smoke + - functional1 test_add_zip_type: result: pass splits: - - smoke - - ci-extended + - functional1 test_download_pdf: result: pass splits: - smoke - - ci-extended test_download_pdf_from_context_menu: result: unstable splits: - - smoke - - ci-extended + - functional1 test_mixed_content_download_via_https: result: linux: pass mac: unstable win: unstable splits: - - smoke + - functional1 test_set_always_ask_file_type: result: pass splits: - - smoke - - ci + - functional1 drag_and_drop: test_copy_entire_row_column: result: pass splits: - smoke - - ci-extended test_copy_from_an_editor_paste_in_another: result: pass splits: - - smoke + - functional1 test_copy_hyperlink_table: result: pass splits: - - smoke + - functional1 test_copy_table_header: result: pass splits: - - smoke + - functional1 test_paste_image_text: result: pass splits: - - smoke + - functional1 find_toolbar: test_find_in_pdf: result: pass splits: - - smoke - - ci-extended + - functional1 test_find_toolbar_nav: result: pass splits: - smoke - - ci-extended test_find_toolbar_search: result: pass splits: - - smoke - - ci - - ci-extended + - functional1 form_autofill: test_address_autofill_attribute: result: pass splits: - smoke - - ci-extended test_autofill_cc_cvv: result: pass splits: - - smoke - - ci-extended + - functional1 test_autofill_credit_card: result: pass splits: - smoke - - ci-extended test_autofill_credit_card_doorhanger: result: pass splits: - - smoke - - ci-extended + - functional1 test_autofill_credit_card_enable: result: pass splits: - - smoke - - ci-extended + - functional1 test_autofill_credit_card_four_fields: result: pass splits: - - smoke - - ci-extended + - functional1 test_cc_clear_form: result: pass splits: - - smoke - - ci-extended + - functional1 test_clear_form: result: pass splits: - - smoke - - ci-extended + - functional1 test_create_new_cc_profile: result: pass splits: - - smoke - - ci-extended + - functional1 test_create_profile_autofill: result: pass splits: - smoke - - ci-extended test_delete_cc_profile: result: pass splits: - - smoke - - ci-extended + - functional1 test_edit_credit_card: result: linux: pass mac: pass win: unstable splits: - - smoke + - functional1 test_enable_disable_autofill: result: pass splits: - - smoke - - ci-extended + - functional1 test_form_autofill_suggestions: result: pass splits: - - smoke - - ci-extended + - functional1 test_name_autofill_attribute: result: pass splits: - smoke - - ci-extended test_private_mode_info_not_saved: result: pass splits: - - smoke - - ci-extended + - functional1 test_telephone_autofill_attribute: result: pass splits: - smoke - ci - - ci-extended test_updating_address: result: pass splits: - - smoke - - ci-extended + - functional1 test_updating_credit_card: result: pass splits: - - smoke + - functional1 geolocation: test_geolocation_shared_via_html5: result: @@ -533,27 +475,23 @@ geolocation: mac: pass win: unstable splits: - - smoke - - ci-extended + - functional1 test_geolocation_shared_via_w3c_api: result: linux: pass mac: pass win: unstable splits: - - smoke - - ci-extended + - functional1 language_packs: test_language_pack_install_addons: result: pass splits: - - smoke - - ci-extended + - functional1 test_language_pack_install_preferences: result: pass splits: - smoke - - ci-extended menus: test_copy_paste_actions: result: pass @@ -566,48 +504,39 @@ menus: mac: pass win: unstable splits: - - smoke - - ci-extended + - functional1 test_hyperlink_context_menu: result: pass splits: - smoke - - ci-extended test_image_context_menu_actions: - result: pass + result: unstable splits: - - smoke - - ci + - functional1 test_tab_context_menu_actions: result: pass splits: - - smoke - - ci-extended + - functional1 test_tab_context_menu_close: result: pass splits: - - smoke - - ci-extended + - functional1 meta: test_selectors: result: unstable splits: [] test_version: result: pass - splits: - - ci-extended + splits: [] networking: test_default_dns_protection: result: pass splits: - smoke - - ci-extended test_http_site: result: pass splits: - - smoke - - ci - - ci-extended + - functional1 notifications: test_audio_video_permissions_notification: result: @@ -615,154 +544,133 @@ notifications: mac: unstable win: pass splits: - - smoke - - ci-extended + - functional1 test_camera_permissions_notification: result: linux: pass mac: unstable win: pass splits: - - smoke - - ci-extended + - functional1 test_deny_geolocation: result: pass splits: - - smoke - - ci-extended + - functional1 test_deny_screen_capture: result: pass splits: - - smoke - - ci-extended + - functional1 test_geolocation_prompt_presence: result: pass splits: - - smoke - - ci-extended + - functional1 test_microphone_permissions_notification: result: linux: pass mac: unstable win: pass splits: - - smoke - - ci-extended + - functional1 test_notifications_displayed: result: pass splits: - smoke - ci - - ci-extended test_screen_share_permission_prompt: result: pass splits: - smoke - - ci-extended test_webextension_completed_installation_successfully_displayed: result: pass splits: - - smoke - - ci-extended + - functional1 password_manager: test_about_logins_navigation_from_context_menu: result: pass splits: - - smoke - - ci + - functional1 test_about_logins_navigation_from_hamburger_menu: result: pass splits: - - smoke + - functional1 test_about_logins_search_username: result: pass splits: - - smoke + - functional1 test_about_logins_search_website: result: pass splits: - - smoke + - functional1 test_add_password_non_ascii_chars: result: pass splits: - - smoke - - ci-extended + - functional1 test_add_password_save_valid_data: result: pass splits: - smoke - - ci-extended test_add_primary_password: result: pass splits: - - smoke + - functional1 test_auto_saved_generated_password_context_menu: result: pass splits: - smoke - - ci-extended test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load: result: pass splits: - - smoke + - functional1 test_can_view_password_when_PP_enabled: result: pass splits: - - smoke - - ci-extended + - functional1 test_changes_made_in_edit_mode_are_saved: result: pass splits: - - smoke - - ci-extended + - functional1 test_delete_login: result: pass splits: - smoke - - ci-extended test_multiple_saved_logins: result: pass splits: - - smoke - - ci-extended + - functional1 test_never_save_login_via_doorhanger: result: pass splits: - smoke - - ci-extended test_password_csv_correctness: result: linux: unstable mac: pass win: pass splits: - - smoke + - functional1 test_password_csv_export: result: linux: unstable mac: pass win: pass splits: - - smoke + - functional1 test_primary_password_triggered_on_about_logins_access: result: pass splits: - - smoke - - ci-extended + - functional1 test_save_login_via_doorhanger: result: pass splits: - - smoke - - ci-extended + - functional1 test_saved_hyperlink_redirects_to_corresponding_page: result: pass splits: - - smoke + - functional1 test_update_login_via_doorhanger: result: pass splits: - - smoke - - ci-extended + - functional1 pdf_viewer: test_add_image_pdf: result: @@ -770,31 +678,27 @@ pdf_viewer: mac: pass win: pass splits: - - smoke + - functional1 test_download_pdf_with_form_fields: result: pass splits: - - smoke - - ci-extended + - functional1 test_download_triggered_on_content_disposition_attachment: result: pass splits: - - smoke - - ci-extended + - functional1 test_open_pdf_in_FF: result: pass splits: - smoke - - ci-extended test_pdf_data_can_be_cleared: result: pass splits: - - smoke - - ci + - functional1 test_pdf_download: result: pass splits: - - smoke + - functional1 test_pdf_input_numbers: result: pass splits: @@ -803,12 +707,10 @@ pdf_viewer: result: pass splits: - smoke - - ci-extended test_zoom_pdf_viewer: result: pass splits: - - smoke - - ci-extended + - functional1 pocket: test_basic_de: test_localized_pocket_layout_DE: @@ -833,8 +735,7 @@ preferences: test_check_for_updates: result: pass splits: - - smoke - - ci-extended + - functional1 test_clear_cookie_data: result: linux: pass @@ -842,212 +743,176 @@ preferences: win: unstable splits: - smoke - - ci-extended test_firefox_home_new_tabs: - result: pass + result: unstable splits: - - smoke - - ci-extended + - functional1 test_firefox_home_on_launch: - result: pass + result: unstable splits: - - smoke - - ci-extended + - functional1 test_lang_pack_changed_from_about_prefs: result: pass splits: - - smoke - - ci-extended + - functional1 test_manage_cookie_data: result: pass splits: - smoke test_never_remember_history: - result: pass + result: unstable splits: - smoke - - ci-extended test_notifications_change_set: result: pass splits: - - smoke - - ci-extended + - functional1 printing_ui: test_print_preview: result: pass splits: - smoke - ci - - ci-extended test_print_to_pdf: result: linux: unstable - mac: pass - win: pass + mac: unstable + win: unstable splits: - - smoke + - functional1 profile: test_set_default_profile: result: pass splits: - smoke - - ci-extended reader_view: test_improved_type_control_panel: result: pass splits: - smoke - ci - - ci-extended test_reader_view_close_sidebar: result: pass splits: - - smoke + - functional1 test_reader_view_location_bar: result: pass splits: - - smoke - - ci-extended + - functional1 scrolling_panning_zooming: test_default_zoom_persists: result: pass splits: - smoke - - ci-extended test_mouse_wheel_zoom: result: linux: pass mac: unstable win: pass splits: - - smoke - - ci-extended + - functional1 test_zoom_from_menu_bar: result: pass splits: - - smoke + - functional1 test_zoom_menu_correlation: result: pass splits: - - smoke + - functional1 test_zoom_text_only: - result: pass + result: unstable splits: - smoke - ci - - ci-extended security_and_privacy: test_blocking_cryptominers: result: pass splits: - smoke - - ci-extended test_blocking_fingerprinters: result: pass splits: - smoke - - ci-extended test_blocking_social_media_trackers: result: unstable splits: - - smoke - - ci-extended + - functional1 test_cookies_not_saved_private_browsing: result: pass splits: - - smoke - - ci-extended + - functional1 test_cross_site_tracking_cookies_blocked: result: pass splits: - - smoke - - ci - - ci-extended + - functional1 test_cryptominers_blocked_and_shown_in_info_panel: result: pass splits: - - smoke - - ci-extended + - functional1 test_detected_blocked_trackers_found: result: pass splits: - - smoke - - ci-extended + - functional1 test_downloads_from_private_not_leaked: result: pass splits: - - smoke - - ci-extended + - functional1 test_https_enabled_private_browsing: result: pass splits: - smoke - - ci-extended test_never_remember_browsing_history: - result: pass + result: unstable splits: - - smoke - - ci-extended + - functional1 test_no_trackers_detected: result: pass splits: - - smoke - - ci-extended + - functional1 test_open_link_in_private_window: result: pass splits: - smoke - - ci-extended test_phishing_and_malware_warnings: result: pass splits: - - smoke - - ci-extended + - functional1 test_private_browser_password_doorhanger: result: pass splits: - - smoke - - ci-extended + - functional1 test_private_session_awesome_bar_exclusion: result: pass splits: - - smoke - - ci-extended + - functional1 test_private_session_history_exclusion: result: pass splits: - - smoke - - ci-extended + - functional1 test_private_window_from_panelui: result: pass splits: - - smoke - - ci-extended + - functional1 test_third_party_content_blocked_private_browsing: result: pass splits: - - smoke - - ci-extended + - functional1 test_tls_v1_2_protocol: result: pass splits: - - smoke - - ci-extended + - functional1 test_trackers_crypto_fingerprint_blocked: result: pass splits: - - smoke - - ci-extended + - functional1 test_tracking_content_custom_mode: result: pass splits: - - smoke - - ci-extended + - functional1 test_undo_close_tab_private_browsing: result: pass splits: - smoke - - ci-extended sync_and_fxa: test_existing_fxa: result: unstable @@ -1063,7 +928,6 @@ tabs: splits: - smoke - ci - - ci-extended test_change_position_of_pinned_tabs: result: pass splits: @@ -1071,7 +935,8 @@ tabs: test_close_pinned_tab_via_mouse: result: pass splits: - - functional1 + - smoke + - ci test_close_tab_through_middle_mouse_click: result: pass splits: @@ -1083,7 +948,7 @@ tabs: test_list_all_tabs: result: pass splits: - - smoke + - functional1 test_move_multi_selected_tabs: result: pass splits: @@ -1094,17 +959,15 @@ tabs: mac: pass win: unstable splits: - - smoke + - functional1 test_navigation_multiple_tabs: result: pass splits: - - smoke - - ci-extended + - functional1 test_open_bookmark_in_new_tab: result: pass splits: - smoke - - ci-extended test_open_new_bg_tab_via_mouse_and_keyboard: result: pass splits: @@ -1113,22 +976,18 @@ tabs: result: pass splits: - smoke - - ci-extended test_open_new_tab_keys: result: pass splits: - - smoke - - ci-extended + - functional1 test_open_new_tab_via_hyperlink: result: pass splits: - - smoke - - ci-extended + - functional1 test_pin_tab: result: pass splits: - smoke - - ci-extended test_pin_unpin_selected_tabs: result: pass splits: @@ -1148,19 +1007,12 @@ tabs: test_reopen_tab_through_context_menu: result: pass splits: - - smoke - - ci-extended + - functional1 test_reopen_tab_through_history_menu: result: pass splits: - - smoke - - ci-extended + - functional1 test_reopen_tabs_through_keys: - result: pass - splits: - - smoke - - ci-extended - test_ungroup_tabs: result: pass splits: - functional1 @@ -1170,8 +1022,7 @@ theme_and_toolbar: splits: - smoke - ci - - ci-extended test_installed_theme_enabled: result: pass splits: - - smoke + - functional1 diff --git a/modules/data/about_newtab.components.json b/modules/data/about_newtab.components.json index dd9866a8f..c2712faad 100644 --- a/modules/data/about_newtab.components.json +++ b/modules/data/about_newtab.components.json @@ -1,22 +1,26 @@ { + "newtab-main": { + "selectorData": "newtab-main", + "strategy": "class", + "groups": [ + "requiredForPage" + ] + }, "incontent-search-input": { "selectorData": "fake-editable", "strategy": "class", "groups": [] }, - "card-by-index": { "selectorData": "article-ds-card", "strategy": "css", "groups": [] }, - "loaded-image-by-index": { "selectorData": "article.ds-card:nth-child({index}) > div.img-wrapper > picture.loaded", "strategy": "css", "groups": [] }, - "sponsored-site-card": { "selectorData": "top-site-outer", "strategy": "class", @@ -25,13 +29,11 @@ "doNotCache" ] }, - "top-site-image-by-index": { "selectorData": ".top-sites-list li:nth-of-type({index}) .top-site-icon.rich-icon", "strategy": "css", "groups": [] }, - "sponsored-site-card-menu-button": { "selectorData": "button[class='context-menu-button icon']", "strategy": "css", @@ -39,44 +41,36 @@ "doNotCache" ] }, - - "top-sites-list": { "selectorData": "top-sites-list", "strategy": "class", "groups": [] }, - "recommended-by-pocket-list": { "selectorData": "ds-card-grid-include-descriptions", "strategy": "class", "groups": [] }, - "story-sponsored-footer": { "selectorData": "article.ds-card > div > div > p.story-sponsored-label", "strategy": "css", "groups": [] }, - "popular-topics-list": { "selectorData": ".ds-navigation > ul", "strategy": "css", "groups": [] }, - "recent-activity-section": { "selectorData": "discovery-stream", "strategy": "class", "groups": [] }, - "recent-activity-list": { "selectorData": "//div[following-sibling::div[@class='section-top-bar']]", "strategy": "xpath", "groups": [] }, - "sponsored-site-context-menu-list": { "selectorData": "ul[class=\"context-menu-list\"]", "strategy": "css", @@ -84,13 +78,11 @@ "doNotCache" ] }, - "body-logo": { "selectorData": "logo", "strategy": "class", "groups": [] }, - "top-site-by-title": { "selectorData": "//li[@class='top-site-outer']//span[@class='title-label' and text()='{title}']/..", "strategy": "xpath", diff --git a/modules/data/about_prefs.components.json b/modules/data/about_prefs.components.json index 6814c9749..478c3e0b5 100644 --- a/modules/data/about_prefs.components.json +++ b/modules/data/about_prefs.components.json @@ -5,15 +5,13 @@ "groups": [] }, "search-engine-dropdown-root": { - "selectorData": "defaultEngine", + "selectorData": "defaultEngineNormal", "strategy": "id", "groups": [ - "requiredForPage", "dropdownRoot", "searchEngineDropdown" ] }, - "custom-tracker-options-parent": { "selectorData": "contentBlockingOptionCustom", "strategy": "id", @@ -85,13 +83,11 @@ "strategy": "id", "groups": [] }, - "remove-search-engine-button": { "selectorData": "removeEngineButton", "strategy": "id", "groups": [] }, - "restore-default-search-engines-button": { "selectorData": "restoreDefaultSearchEngines", "strategy": "id", @@ -404,7 +400,7 @@ "strategy": "id", "groups": [] }, - "search-suggestion-in-private-windows": { + "search-suggestion-in-private-windows": { "selectorData": "showSearchSuggestionsPrivateWindows", "strategy": "id", "groups": [] @@ -608,9 +604,10 @@ "clipboard-suggestion-checkbox": { "selectorData": "#clipboardSuggestion", "strategy": "css", - "groups": ["doNotCache"] + "groups": [ + "doNotCache" + ] }, - "unknown-content-type-dialog": { "selectorData": "unknownContentTypeWindow", "strategy": "id", diff --git a/modules/page_object_prefs.py b/modules/page_object_prefs.py index e46432aaf..0481b6267 100644 --- a/modules/page_object_prefs.py +++ b/modules/page_object_prefs.py @@ -68,6 +68,7 @@ def select_search_suggestions_in_address_bar(self, value: bool = True) -> BasePa def search_engine_dropdown(self) -> Dropdown: """Returns the Dropdown region for search engine prefs""" + self.get_element("search-engine-dropdown-root") return Dropdown( self, self.driver, root=self.get_element("search-engine-dropdown-root") ) diff --git a/pre-commit b/pre-commit index 2614cfe7a..34b5b9046 100755 --- a/pre-commit +++ b/pre-commit @@ -60,7 +60,6 @@ fi # Lint and format with ruff ruff check --select I --fix ruff format . -python addtests.py -q git add -u # if ruff check doesn't work, we need to fail @@ -73,5 +72,10 @@ if ! ruff format -q; then echo "Formatting failed!" exit 1 fi + +if ! python addtests.py -q; then + echo "Manifest missing tests!" + exit 1 +fi # If there are whitespace errors, print the offending file names and fail. exec git diff-index --check --cached $against -- diff --git a/taskcluster/kinds/new-beta-qa/kind.yml b/taskcluster/kinds/new-beta-qa/kind.yml index 56a64c4ef..13b68575a 100644 --- a/taskcluster/kinds/new-beta-qa/kind.yml +++ b/taskcluster/kinds/new-beta-qa/kind.yml @@ -8,7 +8,7 @@ task-defaults: worker-type: t-linux-wayland worker: taskcluster-proxy: true - max-run-time: 3600 + max-run-time: 7200 artifacts: - name: public/results path: checkouts/vcs/artifacts