Skip to content

Commit 2155652

Browse files
sarinalisarinali
committed
fix formatting
2 parents 2bb50b7 + 5bfde38 commit 2155652

File tree

6 files changed

+3451
-10
lines changed

6 files changed

+3451
-10
lines changed

‎contents.html

Lines changed: 3306 additions & 0 deletions
Large diffs are not rendered by default.

‎modules/data/about_addons.components.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,17 @@
3939
"selectorData": "button[data-l10n-id='install-theme-button']",
4040
"strategy": "css",
4141
"groups": []
42+
},
43+
44+
"languages-addon-list": {
45+
"selectorData": "locale-enabled-section",
46+
"strategy": "class",
47+
"groups": []
48+
},
49+
50+
"languages-addon-list-card": {
51+
"selectorData": "addon-card",
52+
"strategy": "tag",
53+
"groups": []
4254
}
4355
}

‎modules/data/generic_page.components.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,43 @@
33
"selectorData": "body",
44
"strategy": "tag",
55
"groups": []
6+
},
7+
8+
"language-addons-row": {
9+
"selectorData": "tr[class='LanguageTools-table-row LanguageTools-lang-it']",
10+
"strategy": "css",
11+
"groups": []
12+
},
13+
14+
"language-addons-title": {
15+
"selectorData": "Card-header-text",
16+
"strategy": "class",
17+
"groups": []
18+
},
19+
20+
"language-addons-row-link": {
21+
"selectorData": "a",
22+
"strategy": "tag",
23+
"groups": []
24+
},
25+
26+
"language-addons-subpage-header": {
27+
"selectorData": "AddonTitle",
28+
"strategy": "class",
29+
"groups": []
30+
},
31+
32+
"language-addons-subpage-add-to-firefox": {
33+
"selectorData": "div[class='AMInstallButton AMInstallButton--noDownloadLink']",
34+
"strategy": "css",
35+
"groups": []
36+
},
37+
38+
"language-install-popup-add": {
39+
"selectorData": "button[class='popup-notification-primary-button primary footer-button']",
40+
"strategy": "css",
41+
"groups": [
42+
"doNotCache"
43+
]
644
}
745
}

‎tests/address_bar_and_search/test_sap_google_adclick.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import time
22

3-
import pytest
43
from selenium.webdriver import Firefox
54

65
from modules.browser_object_navigation import Navigation

‎tests/language_packs/test_language_pack_install_addons.py

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,50 @@
1-
from time import sleep
2-
31
from selenium.webdriver import Firefox
42

5-
from modules.page_object import AboutAddons, AboutPrefs, Navigation
3+
# from modules.page_object import AboutAddons, AboutPrefs
4+
from modules.page_object import AboutAddons, GenericPage
5+
6+
# from modules.util import Utilities
7+
8+
LANGUAGE_ADDONS_LINK = "https://addons.mozilla.org/en-US/firefox/language-tools/"
69

710

811
def test_language_pack_install_from_addons(driver: Firefox):
9-
""" "
12+
"""
1013
C1549408: verify that installing a language pack from about:addons will correctly change the locale
1114
"""
12-
about_prefs = AboutPrefs(driver, category="general")
13-
about_addons = AboutAddons(driver)
14-
nav = Navigation(driver).open()
15+
# about_prefs = AboutPrefs(driver, category="general")
16+
generic_page = GenericPage(driver)
17+
# util = Utilities()
18+
19+
driver.get(LANGUAGE_ADDONS_LINK)
20+
21+
generic_page.custom_wait(timeout=20).until(
22+
lambda _: generic_page.get_element("language-addons-title") is not None
23+
)
24+
25+
language_row = generic_page.get_element("language-addons-row")
26+
generic_page.get_element(
27+
"language-addons-row-link", parent_element=language_row
28+
).click()
29+
generic_page.custom_wait(timeout=20).until(
30+
lambda _: generic_page.get_element("language-addons-subpage-header") is not None
31+
)
32+
33+
generic_page.get_element("language-addons-subpage-add-to-firefox").click()
34+
35+
with driver.context(driver.CONTEXT_CHROME):
36+
# click one for "Add"
37+
generic_page.get_element("language-install-popup-add").click()
38+
# click second time for "Okay", the button is not cached which allows for two different buttons to be different
39+
generic_page.get_element("language-install-popup-add").click()
40+
41+
about_addons = AboutAddons(driver).open()
42+
about_addons.choose_sidebar_option("locale")
43+
44+
addon_list_parent = about_addons.get_element("languages-addon-list")
45+
addon_language_cards = about_addons.get_element(
46+
"languages-addon-list-card", multiple=True, parent_element=addon_list_parent
47+
)
1548

16-
nav.search("https://addons.mozilla.org/en-US/firefox/language-tools/")
17-
sleep(10)
49+
# making sure that 1 language was installed
50+
assert len(addon_language_cards) == 1

‎tests/language_packs/test_language_pack_install_preferences.py

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
from selenium.webdriver import Firefox
2+
3+
from modules.page_object import AboutPrefs
4+
from modules.util import BrowserActions
5+
6+
7+
def test_language_pack_install_about_preferences(driver: Firefox):
8+
"""
9+
C1549409: language packs can be installed from about:preferences and firefox is correctly localized
10+
"""
11+
# instantiate objects
12+
about_prefs = AboutPrefs(driver, category="general").open()
13+
ba = BrowserActions(driver)
14+
alternative_button = about_prefs.get_element("language-set-alternatives-button")
15+
alternative_button.click()
16+
17+
# press the alternatives button and find italian
18+
iframe = about_prefs.get_element("browser-popup")
19+
ba.switch_to_iframe_context(iframe)
20+
about_prefs.get_element("language-set-alternatives-popup-select-language").click()
21+
about_prefs.element_clickable(
22+
"language-set-alternatives-popup-select-language-search-more"
23+
)
24+
more_languages_option = about_prefs.get_element(
25+
"language-set-alternatives-popup-select-language-search-more"
26+
)
27+
about_prefs.double_click(more_languages_option)
28+
29+
# waiting for the language install to be sucessful
30+
about_prefs.custom_wait(timeout=20).until(
31+
lambda _: about_prefs.get_element(
32+
"language-set-alternatives-popup-select-language"
33+
).get_attribute("label")
34+
== "Select a language to add…"
35+
)
36+
37+
# activate the italian language
38+
dropdown_selection = about_prefs.get_element(
39+
"language-set-alternatives-popup-select-language"
40+
)
41+
dropdown_selection.click()
42+
about_prefs.get_element(
43+
"language-set-alternatives-popup-select-language-italian"
44+
).click()
45+
dropdown_selection.click()
46+
about_prefs.get_element("language-add-button").click()
47+
about_prefs.get_element("language-list-item").click()
48+
about_prefs.get_element("language-accept-button").click()
49+
50+
# final asserts to ensure language is set
51+
ba.switch_to_content_context()
52+
assert about_prefs.get_element("html-root").get_attribute("lang") == "it"
53+
assert alternative_button.get_attribute("label") == "Imposta alternative…"

0 commit comments

Comments
 (0)