Skip to content

Commit 9f14102

Browse files
authored
Merge branch 'main' into sangie/move-multi-selected-tabs
2 parents f59403c + 47e84af commit 9f14102

File tree

50 files changed

+1524
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1524
-177
lines changed

.github/workflows/check-beta-l10n.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Check new beta version - L10N
22

33
on:
44
schedule:
5-
- cron: "21 */1 * * *"
5+
- cron: "21 */2 * * *"
66
env:
77
LATEST: ""
88
permissions:

.github/workflows/l10n.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ jobs:
195195
echo $gecko_url
196196
Invoke-WebRequest -Uri $gecko_url -OutFile "geckodriver.zip"
197197
unzip geckodriver.zip
198+
echo "$env:GITHUB_WORKSPACE" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
198199
shell: pwsh
199200
- name: Download Beta
200201
if: ${{ !inputs.win_installer_link }}

.github/workflows/smoke.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ jobs:
8080
echo $gecko_url
8181
Invoke-WebRequest -Uri $gecko_url -OutFile "geckodriver.zip"
8282
unzip geckodriver.zip
83+
echo "$env:GITHUB_WORKSPACE" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
8384
shell: pwsh
8485
- name: Download Beta
8586
if: ${{ !inputs.win_installer_link }}
@@ -107,7 +108,7 @@ jobs:
107108
$env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
108109
Start-Process -FilePath $env:FX_EXECUTABLE -ArgumentList "--version" -Wait -NoNewWindow
109110
pipenv run python choose_ci_set.py
110-
pipenv run pytest --geckodriver geckodriver.exe $(cat selected_tests)
111+
pipenv run pytest $(cat selected_tests)
111112
$env:TEST_EXIT_CODE = $LASTEXITCODE
112113
mv artifacts artifacts-win || true
113114
exit $env:TEST_EXIT_CODE
@@ -120,7 +121,7 @@ jobs:
120121
mv ./ci_pyproject_headed.toml ./pyproject.toml;
121122
$env:FX_EXECUTABLE = "C:\Program Files\Custom Firefox\firefox.exe"
122123
pipenv run python choose_ci_set.py
123-
pipenv run pytest --geckodriver geckodriver.exe $(cat selected_tests)
124+
pipenv run pytest $(cat selected_tests)
124125
$env:TEST_EXIT_CODE = $LASTEXITCODE
125126
rm artifacts/assets -r -Force
126127
Get-ChildItem -Path "artifacts" | ForEach-Object {

SELECTOR_INFO.md

Lines changed: 131 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,20 @@ Location: about:preferences#search
460460
Path to .json: modules/data/about_prefs.components.json
461461
```
462462
```
463+
Selector Name: show-suggestions-in-address-bar
464+
Selector Data: showSearchSuggestionsFirstCheckbox
465+
Description: Parent Checkbox element to show suggestions in search
466+
Location: about:preferences#search
467+
Path to .json: modules/data/about_prefs.components.json
468+
```
469+
```
470+
Selector Name: show-suggestions-awesomebar
471+
Selector Data: urlBarSuggestion
472+
Description: Checkbox element to show suggestions in the Awesomebar
473+
Location: about:preferences#search
474+
Path to .json: modules/data/about_prefs.components.json
475+
```
476+
```
463477
Selector Name: search-engine-dropmarker
464478
Selector Data: "dropmarker"
465479
Description: Button that opens the search engine options list
@@ -649,16 +663,16 @@ Location: about:preferences#search
649663
Path to .json: modules/data/about_prefs.components.json
650664
```
651665
```
652-
Selector Name: firefox-suggest-nonsponsored
653-
Selector Data: "firefoxSuggestNonsponsored"
666+
Selector Name: firefox-suggestions
667+
Selector Data: showSearchSuggestionsFirstCheckbox
654668
Description: The Suggestions from Firefox check-box
655669
Location: about:preferences#search > Address Bar - Firefox Suggest
656670
Path to .json: modules/data/about_prefs.components.json
657671
```
658672
```
659-
Selector Name: firefox-suggest-sponsored
660-
Selector Data: "firefoxSuggestSponsored"
661-
Description: The Suggestions from sponsors check-box
673+
Selector Name: firefox-trending-suggestions
674+
Selector Data: showTrendingSuggestions
675+
Description: Trending search suggestions check-box
662676
Location: about:preferences#search > Address Bar - Firefox Suggest
663677
Path to .json: modules/data/about_prefs.components.json
664678
```
@@ -1201,6 +1215,34 @@ Description: The unknown content type dialog
12011215
Location: about:preferences#general Applications subsection
12021216
Path to .json: modules/data/about_prefs.components.json
12031217
```
1218+
```
1219+
Selector Name: search-shortcuts-group
1220+
Selector Data: oneClickSearchProvidersGroup
1221+
Description: The Search shortcuts table
1222+
Location: about:preferences#search Search Shortcuts subsection
1223+
Path to .json: modules/data/about_prefs.components.json
1224+
```
1225+
```
1226+
Selector Name: search-engine-list
1227+
Selector Data: engineList
1228+
Description: The Search shortcuts options list
1229+
Location: about:preferences#search Search Shortcuts subsection
1230+
Path to .json: modules/data/about_prefs.components.json
1231+
```
1232+
```
1233+
Selector Name: remove-search-engine-button
1234+
Selector Data: removeEngineButton
1235+
Description: The Remove button under Search shortcuts tabel
1236+
Location: about:preferences#search Search Shortcuts subsection
1237+
Path to .json: modules/data/about_prefs.components.json
1238+
```
1239+
```
1240+
Selector Name: restore-default-search-engines-button
1241+
Selector Data: restoreDefaultSearchEngines
1242+
Description: The Restore Default Search Engines button under Search shortcuts tabel
1243+
Location: about:preferences#search Search Shortcuts subsection
1244+
Path to .json: modules/data/about_prefs.components.json
1245+
```
12041246
#### about_profiles
12051247
```
12061248
Selector Name: profile-container
@@ -1919,6 +1961,20 @@ Location: Customize firefox options in Context Chrome
19191961
Path to .json: modules/data/customize_firefox.components.json
19201962
```
19211963
```
1964+
Selector Name: nav-searchbar
1965+
Selector Data: "search-container"
1966+
Description: the search container element
1967+
Location: Customize firefox options in Context Chrome
1968+
Path to .json: modules/data/customize_firefox.components.json
1969+
```
1970+
```
1971+
Selector Name: done-button
1972+
Selector Data: "customization-done-button"
1973+
Description: The done button in the customizd toolbar
1974+
Location: Customize firefox options in Context Chrome
1975+
Path to .json: modules/data/customize_firefox.components.json
1976+
```
1977+
```
19221978
Selector Name: history
19231979
Selector Data: "wrapper-history-panelmenu"
19241980
Description: The history button from the customizing options
@@ -2288,6 +2344,13 @@ Description: bsky website sign in button
22882344
Location: Bsky website
22892345
Path to .json: modules/data/generic_page.components.json
22902346
```
2347+
```
2348+
Selector Name: url-to-copy
2349+
Selector Data: "p[contenteditable]"
2350+
Description: Clipboard page to copy url
2351+
Location: Clipboard test page
2352+
Path to .json: modules/data/generic_page.components.json
2353+
```
22912354
#### generic_pdf
22922355
```
22932356
Selector Name: highlighted-text
@@ -2569,6 +2632,13 @@ Path to .json: modules/data/login_autofill.components.json
25692632
Selector Name: bsky-credentials
25702633
Selector Data: ".autocomplete-richlistbox .autocomplete-richlistitem[ac-value='username1']"
25712634
Description: Autocomplete dropdown is toggled for focused login fields on facebook page load
2635+
Location: bsky page load
2636+
Path to .json: modules/data/login_autofill.components.json
2637+
```
2638+
```
2639+
Selector Name: facebook-credentials
2640+
Selector Data: ".autocomplete-richlistbox .autocomplete-richlistitem[ac-value='username1']"
2641+
Description: Autocomplete dropdown is toggled for focused login fields on facebook page load
25722642
Location: Facebook page load
25732643
Path to .json: modules/data/login_autofill.components.json
25742644
```
@@ -3196,6 +3266,55 @@ Description: Searchmode engine label
31963266
Location: Address bar searchmode engine label
31973267
Path to .json: modules/data/navigation.components.json
31983268
```
3269+
```
3270+
Selector Name: selected_searchbar-search-engine
3271+
Selector Data: button.searchbar-engine-one-off-item[tooltiptext='{engine}'][selected]
3272+
Description: Searchbar-search-engine
3273+
Location: Selected search bar search engine
3274+
Path to .json: modules/data/navigation.components.json
3275+
```
3276+
```
3277+
Selector Name: searchbar-suggestions
3278+
Selector Data: hbox.search-one-offs
3279+
Description: Searchbar suggestions
3280+
Location: Searchbar results
3281+
Path to .json: modules/data/navigation.components.json
3282+
```
3283+
```
3284+
Selector Name: searchbar-magnifying-glass-button
3285+
Selector Data: hbox.searchbar-search-button[data-l10n-id='searchbar-icon']
3286+
Description: Searchbar magnifying glass button
3287+
Location: Searchbar
3288+
Path to .json: modules/data/navigation.components.json
3289+
```
3290+
```
3291+
Selector Name: searchbar-search-engine
3292+
Selector Data: button.searchbar-engine-one-off-item[tooltiptext='{engine}'
3293+
Description: Searchbar search engine button
3294+
Location: Searchbar
3295+
Path to .json: modules/data/navigation.components.json
3296+
```
3297+
```
3298+
Selector Name: search-mode-chicklet
3299+
Selector Data: label.searchmode-switcher-title
3300+
Description: Search mode chicklet
3301+
Location: Address bar search mode
3302+
Path to .json: modules/data/navigation.components.json
3303+
```
3304+
```
3305+
Selector Name: history-button-search-mode
3306+
Selector Data: search-button-history
3307+
Description: Histroy button search mode
3308+
Location: Search mode
3309+
Path to .json: modules/data/navigation.components.json
3310+
```
3311+
```
3312+
Selector Name: exit-button-searchmode
3313+
Selector Data: toolbarbutton[data-l10n-id='urlbar-searchmode-exit-button']
3314+
Description: Exit button searchmode
3315+
Location: Address bar searchmode
3316+
Path to .json: modules/data/navigation.components.json
3317+
```
31993318
#### panel_ui
32003319
```
32013320
Selector name: panel-ui-button
@@ -3573,7 +3692,13 @@ Description: Edit bookmark panel
35733692
Location: Bookmark panel
35743693
Path to .json: modules/data/pane_ui.components.json
35753694
```
3576-
3695+
```
3696+
Selector Name: toolbarspring
3697+
Selector Data: ustomizableui-special-spring2
3698+
Description: toolbarspring
3699+
Location: Toolbar
3700+
Path to .json: modules/data/navigation.components.json
3701+
```
35773702
#### print_preview
35783703
```
35793704
Selector name: print-preview-browser

l10n_CM/constants/demo/demo_ad.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"email": "email",
1212
"telephone": "tel"
1313
},
14+
1415
"fields": [
1516
"name",
1617
"organization",

l10n_CM/region/AT.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"libro",
1111
"mediamarkt"
1212
],
13+
1314
"tests": [
1415
]
1516
}

l10n_CM/run_l10n.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@
1313
from choose_l10n_ci_set import valid_l10n_mappings
1414

1515
current_dir = os.path.dirname(__file__)
16-
valid_flags = {"--run-headless", "-n", "--reruns", "--fx-executable", "--ci"}
16+
valid_flags = {
17+
"--run-headless",
18+
"-n",
19+
"--reruns",
20+
"--fx-executable",
21+
"--ci",
22+
"--geckodriver",
23+
}
1724
flag_with_parameter = {"-n", "--reruns"}
1825
valid_region = {"US", "CA", "DE", "FR", "IT", "GB", "PL", "ES", "BE", "AT"}
1926
valid_sites = {
@@ -115,7 +122,7 @@ class MyHttpRequestHandler(SimpleHTTPRequestHandler):
115122
region = None
116123

117124
def translate_path(self, path):
118-
"""switch the default directory where the html files are served from."""
125+
"""switch the default directory where the HTML files are served from."""
119126
base_dir = os.path.join(current_dir, "sites", self.live_site, self.region)
120127
return os.path.join(base_dir, path.lstrip("/"))
121128

modules/browser_object_autofill_popup.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import time
12
from typing import Union
23

34
from selenium.webdriver.remote.webelement import WebElement
@@ -126,3 +127,20 @@ def get_primary_value(self, element: WebElement) -> str:
126127
Returns: str: The primary value extracted from the element's attribute
127128
"""
128129
return element.get_attribute("ac-value")
130+
131+
@BasePage.context_chrome
132+
def verify_update_password_doorhanger(self, nav, expected_text):
133+
"""
134+
Wait for and verify that the 'Update password' doorhanger is displayed
135+
with the expected text
136+
"""
137+
# Wait for and open the doorhanger
138+
time.sleep(1)
139+
nav.expect(lambda _: nav.element_visible("password-notification-key"))
140+
nav.click_on("password-notification-key")
141+
142+
# Verify the doorhanger text
143+
self.expect(
144+
lambda _: expected_text
145+
in self.get_element("password-update-doorhanger").text
146+
)

0 commit comments

Comments
 (0)