Skip to content

Commit 77e5d47

Browse files
committed
Merge branch 'main' into vs/FR-CM-tests
2 parents 69aedbc + 56ced50 commit 77e5d47

23 files changed

+139
-133
lines changed

.github/workflows/check-beta.yml

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

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

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "pypi"
77
faker = "26.3.0"
88
selenium = "<4.24"
99
pynput = "1.7.7"
10-
pytest = "<9.0"
10+
pytest = "<8.4"
1111
pytest-httpserver = "1.0.12"
1212
requests = "<3.0"
1313
pytest-xdist = "3.6.1"

l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ def test_hover_email_and_phone_autofill_preview(
1818
address_autofill: AddressFill,
1919
fill_and_save_address: AutofillAddressBase,
2020
):
21+
"""
22+
C2888568: Verify that hovering over phone/email fields will preview all fields
23+
"""
2124
# Create fake data
2225
address_autofill.open()
2326

l10n_CM/Unified/test_demo_ad_3c_autofill_phone_email_fields.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_demo_ad_autofill_phone_email(
1717
fill_and_save_address: AutofillAddressBase,
1818
):
1919
"""
20-
C2888569 - Verify Autofill functionality when selecting an entry from the dropdown for tele/email fields
20+
C2888569 - Verify Autofill functionality when selecting an entry from the dropdown for phone/email fields
2121
"""
2222
# Create fake data
2323
address_autofill.open()

l10n_CM/Unified/test_demo_ad_5c_clear_phone_email_fields.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_demo_ad_clear_tel_email(
1717
fill_and_save_address: AutofillAddressBase,
1818
):
1919
"""
20-
C2888571 - Verify clear functionality after selecting an entry from tele/email fields
20+
C2888571 - Verify clear functionality after selecting an entry from phone/email fields
2121
"""
2222
# Create fake data and fill it in
2323
address_autofill.open()

l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@pytest.fixture()
1010
def test_case():
11-
return "2886581"
11+
return "2888704"
1212

1313

1414
def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
@@ -20,7 +20,7 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
2020
is_live_site: str,
2121
):
2222
"""
23-
C2888704 - Verify tele/email data are captured in the Capture Doorhanger and stored in about:preferences
23+
C2888704 - Verify phone/email data are captured in the Capture Doorhanger and stored in about:preferences
2424
"""
2525
if not is_live_site:
2626
# Create fake data and fill it in

l10n_CM/Unified/test_demo_cc_0_add_new_credit_card.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@pytest.fixture()
1111
def test_case():
12-
return "2886595"
12+
return "3056980"
1313

1414

1515
def test_create_new_cc_profile(
@@ -19,7 +19,7 @@ def test_create_new_cc_profile(
1919
populate_saved_payments: CreditCardBase,
2020
):
2121
"""
22-
C2886595 - Tests you can create and save a new Credit Card profile
22+
C3056980 - Tests you can create and save a new Credit Card profile
2323
"""
2424
# get sample data
2525
credit_card_sample_data = populate_saved_payments

l10n_CM/Unified/test_demo_cc_1_dropdown.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@pytest.fixture()
99
def test_case():
10-
return "2886598"
10+
return "3056983"
1111

1212

1313
def test_dropdown_presence_credit_card(
@@ -17,7 +17,7 @@ def test_dropdown_presence_credit_card(
1717
fill_and_save_payments: CreditCardBase,
1818
):
1919
"""
20-
C2886598 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
20+
C3056983 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
2121
"""
2222
# Open credit card form page
2323
credit_card_autofill.open()

l10n_CM/Unified/test_demo_cc_2_preview.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@pytest.fixture()
1111
def test_case():
12-
return "2886599"
12+
return "3056984"
1313

1414

1515
@pytest.fixture()
@@ -26,7 +26,7 @@ def test_cc_preview(
2626
fill_and_save_payments: CreditCardBase,
2727
):
2828
"""
29-
C2886599 - Verify that hovering over field will preview all eligible fields (except for the CVV field)
29+
C3056984 - Verify that hovering over field will preview all eligible fields (except for the CVV field)
3030
"""
3131

3232
# Open credit card form page

l10n_CM/Unified/test_demo_cc_3_autofill.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@pytest.fixture()
1010
def test_case():
11-
return "2886600"
11+
return "3056985"
1212

1313

1414
def test_cc_autofill_from_dropdown(
@@ -19,7 +19,7 @@ def test_cc_autofill_from_dropdown(
1919
region: str,
2020
):
2121
"""
22-
Verify that saved credit card information is autofilled correctly when selected from the dropdown,
22+
C3056985 - Verify that saved credit card information is autofilled correctly when selected from the dropdown,
2323
except for the CVV field.
2424
Arguments:
2525
credit_card_autofill: CreditCardFill instance

l10n_CM/Unified/test_demo_cc_4_highlight.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@pytest.fixture()
99
def test_case():
10-
return "2886601"
10+
return "3056986"
1111

1212

1313
def test_cc_yellow_highlight(
@@ -17,7 +17,7 @@ def test_cc_yellow_highlight(
1717
fill_and_save_payments: CreditCardBase,
1818
):
1919
"""
20-
C2886601 - Verify the yellow highlight appears on autofilled fields and make sure csv field is not highlighted
20+
C3056986 - Verify the yellow highlight appears on autofilled fields and make sure csv field is not highlighted
2121
"""
2222
# Open the credit card fill form and trigger the autofill option
2323
credit_card_autofill.open()

l10n_CM/Unified/test_demo_cc_5_clear.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@pytest.fixture()
99
def test_case():
10-
return "2886602"
10+
return "3056987"
1111

1212

1313
def test_cc_clear_form(
@@ -17,7 +17,7 @@ def test_cc_clear_form(
1717
fill_and_save_payments: CreditCardBase,
1818
):
1919
"""
20-
C2886602 - Verify that clearing the form from any field results in all fields being emptied, regardless of the
20+
C3056987 - Verify that clearing the form from any field results in all fields being emptied, regardless of the
2121
field from which the clear action was triggered.
2222
"""
2323

l10n_CM/Unified/test_demo_cc_6_capture_doorhanger_appearance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@pytest.fixture()
99
def test_case():
10-
return "2889441"
10+
return "3056981"
1111

1212

1313
def test_cc_check_door_hanger_is_displayed(
@@ -18,7 +18,7 @@ def test_cc_check_door_hanger_is_displayed(
1818
is_live_site: str,
1919
):
2020
"""
21-
C2889441 - Ensures that the door hanger is displayed after filling credit card info
21+
C3056981 - Ensures that the door hanger is displayed after filling credit card info
2222
"""
2323
if not is_live_site:
2424
# Navigate to page

l10n_CM/Unified/test_demo_cc_7_capture_doorhanger_capture_and_stored_data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@pytest.fixture()
1010
def test_case():
11-
return "2886597"
11+
return "3056982"
1212

1313

1414
def test_demo_cc_data_captured_in_doorhanger_and_stored(
@@ -20,7 +20,7 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
2020
is_live_site: str,
2121
):
2222
"""
23-
C2889999 - Verify credit card data is captured in the Capture Doorhanger and stored in about:preferences
23+
C3056982 - Verify credit card data is captured in the Capture Doorhanger and stored in about:preferences
2424
"""
2525
if not is_live_site:
2626
# Navigate to page

modules/browser_object_navigation.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -344,26 +344,24 @@ def bookmark_page_other(self) -> BasePage:
344344
return self
345345

346346
@BasePage.context_chrome
347-
def add_bookmark_advanced(
347+
def add_bookmark_via_other_bookmark_context_menu(
348348
self, bookmark_data: Bookmark, ba: BrowserActions
349349
) -> BasePage:
350350
iframe = self.get_element("bookmark-iframe")
351351
ba.switch_to_iframe_context(iframe)
352352
# fill name
353-
if bookmark_data.name is not None:
354-
self.actions.send_keys(bookmark_data.name).perform()
353+
self.actions.send_keys(bookmark_data.name).perform()
355354
self.actions.send_keys(Keys.TAB).perform()
356355
# fill url
357356
self.actions.send_keys(bookmark_data.url + Keys.TAB).perform()
358357
# fill tags
359-
if bookmark_data.tags is not None:
360-
self.actions.send_keys(bookmark_data.tags).perform()
358+
self.actions.send_keys(bookmark_data.tags).perform()
359+
self.actions.send_keys(Keys.TAB).perform()
361360
self.actions.send_keys(Keys.TAB).perform()
362361
# fill keywords
363-
if bookmark_data.keyword is not None:
364-
self.actions.send_keys(bookmark_data.keyword).perform()
365-
self.actions.send_keys(Keys.TAB, Keys.TAB, Keys.TAB, Keys.ENTER).perform()
366-
ba.switch_to_content_context()
362+
self.actions.send_keys(bookmark_data.keyword).perform()
363+
# save the bookmark
364+
self.actions.send_keys(Keys.ENTER).perform()
367365
return self
368366

369367
@BasePage.context_chrome

modules/page_object_prefs.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ def import_bookmarks(self, browser_name: str, platform) -> BasePage:
567567
# There are two messages that indicate a successful migration
568568
self.wait.until(
569569
lambda _: self.get_element("migration-progress-header").text
570-
in ["Data Imported Successfully", "Data Import Complete"]
570+
in ["Data imported successfully", "Data import complete"]
571571
)
572572
self.actions.send_keys(" ").perform()
573573
return self
@@ -598,6 +598,7 @@ def choose_sidebar_option(self, option: str):
598598
"""
599599
Clicks the corresponding sidebar option from the about:addons page.
600600
"""
601+
sleep(1)
601602
self.get_element("sidebar-options", labels=[option]).click()
602603

603604
def activate_theme(
@@ -609,7 +610,7 @@ def activate_theme(
609610
Attributes
610611
----------
611612
nav: Navigation
612-
The navgiation object
613+
The navigation object
613614
theme_name: str
614615
The name of the theme to press
615616
intended_color: str
@@ -653,7 +654,7 @@ def enabled_theme_matches(self, expected_theme: str) -> bool:
653654

654655
def check_theme_has_changed(self, original_theme: str) -> BasePage:
655656
"""
656-
Ensure that the theme has changed.
657+
Ensure the theme has changed.
657658
"""
658659
assert not self.enabled_theme_matches(original_theme)
659660
return self

modules/testrail.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,12 @@ def create_test_run_on_plan_entry(
200200
logging.info(f"run on plan entry configs {config_ids}")
201201
payload = {
202202
"config_ids": config_ids,
203-
"description": description,
204203
"include_all": not bool(case_ids),
205204
}
206205
if case_ids:
207206
payload["case_ids"] = case_ids
207+
if description:
208+
payload["description"] = description
208209
logging.info(f"create run on entry payload:\n{payload}")
209210
return self.client.send_post(
210211
f"add_run_to_plan_entry/{plan_id}/{entry_id}", payload

0 commit comments

Comments
 (0)