From fa7b904231c5188c2183efa010e4432acbab38ec Mon Sep 17 00:00:00 2001 From: soncuteanca Date: Tue, 5 Aug 2025 17:16:37 +0300 Subject: [PATCH 1/8] Add CM movieposters CA --- l10n_CM/Unified/conftest.py | 4 +-- .../movieposters/CA/movieposters_ad.json | 31 +++++++++++++++++++ .../movieposters/CA/movieposters_cc.json | 15 +++++++++ l10n_CM/region/CA.json | 3 +- l10n_CM/run_l10n.py | 3 +- .../movieposters/CA/movieposters_ad.html | 3 ++ .../movieposters/CA/movieposters_cc.html | 10 ++++++ 7 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 l10n_CM/constants/movieposters/CA/movieposters_ad.json create mode 100644 l10n_CM/constants/movieposters/CA/movieposters_cc.json create mode 100644 l10n_CM/sites/movieposters/CA/movieposters_ad.html create mode 100644 l10n_CM/sites/movieposters/CA/movieposters_cc.html diff --git a/l10n_CM/Unified/conftest.py b/l10n_CM/Unified/conftest.py index 70f41c11a..efd9e4ce6 100644 --- a/l10n_CM/Unified/conftest.py +++ b/l10n_CM/Unified/conftest.py @@ -42,12 +42,12 @@ def get_html_files(live_site, region): @pytest.fixture() def region(): - return os.environ.get("FX_REGION", "US") + return os.environ.get("FX_REGION", "CA") @pytest.fixture() def live_site(): - return os.environ.get("CM_SITE", "demo") + return os.environ.get("CM_SITE", "movieposters") @pytest.fixture() diff --git a/l10n_CM/constants/movieposters/CA/movieposters_ad.json b/l10n_CM/constants/movieposters/CA/movieposters_ad.json new file mode 100644 index 000000000..ca4c32633 --- /dev/null +++ b/l10n_CM/constants/movieposters/CA/movieposters_ad.json @@ -0,0 +1,31 @@ +{ + "url": "http://127.0.0.1:8080/movieposters_ad.html", + "field_mapping": { + "given_name": "76d61249-afe6-4bc4-9c9a-a62c5d8107de", + "family_name": "9536d8e7-519e-4197-ae5b-7bbe127925d0", + "organization": "5c8e00c8-ad7d-488b-aff3-67a728498ae0", + "street_address": "fdc9d3f2-13f8-47db-90a3-7a18584028cb", + "address_level_2": "3ee2821f-8f38-4a9d-b95c-e3f62b4ea69e", + "address_level_1": "ecbdd508-3d94-45ec-97b5-c2b642dc3fe6", + "postal_code": "f60c786d-a9bb-41af-ac0f-bff95bb7d3ad", + + "country" : "c02b72d4-ba59-4c54-bd27-b4b686cc9133", + "telephone": "c11c59df-db4e-459a-9590-4798a6d22030", + "email": "5f14e679-8b86-4b2d-98ab-0746f1902eca" + + }, + "form_field": "*[data-moz-autofill-inspect-id='{name}']", + "fields": [ + "76d61249-afe6-4bc4-9c9a-a62c5d8107de", + "9536d8e7-519e-4197-ae5b-7bbe127925d0", + "5c8e00c8-ad7d-488b-aff3-67a728498ae0", + "fdc9d3f2-13f8-47db-90a3-7a18584028cb", + "3ee2821f-8f38-4a9d-b95c-e3f62b4ea69e", + "ecbdd508-3d94-45ec-97b5-c2b642dc3fe6", + "f60c786d-a9bb-41af-ac0f-bff95bb7d3ad", + "c02b72d4-ba59-4c54-bd27-b4b686cc9133", + "c11c59df-db4e-459a-9590-4798a6d22030", + "5f14e679-8b86-4b2d-98ab-0746f1902eca" + + ] +} \ No newline at end of file diff --git a/l10n_CM/constants/movieposters/CA/movieposters_cc.json b/l10n_CM/constants/movieposters/CA/movieposters_cc.json new file mode 100644 index 000000000..5e5a06e5c --- /dev/null +++ b/l10n_CM/constants/movieposters/CA/movieposters_cc.json @@ -0,0 +1,15 @@ +{ + "url": "http://127.0.0.1:8080/movieporters_cc.html", + "field_mapping": { + "card_number": "11111111-aaaa-bbbb-cccc-000000000000", + "expiration_date": "22222222-bbbb-cccc-dddd-111111111111", + "cvv": "33333333-cccc-dddd-eeee-222222222222" + }, + "form_field": "*[data-moz-autofill-inspect-id='{name}']", + "skip": "True", + "fields": [ + "11111111-aaaa-bbbb-cccc-000000000000", + "22222222-bbbb-cccc-dddd-111111111111", + "33333333-cccc-dddd-eeee-222222222222" + ] +} diff --git a/l10n_CM/region/CA.json b/l10n_CM/region/CA.json index 71424a385..c93222630 100644 --- a/l10n_CM/region/CA.json +++ b/l10n_CM/region/CA.json @@ -7,7 +7,8 @@ "etsy", "newbalance", "canadatire", - "ebay" + "ebay", + "movieposters" ], "tests": [ ] diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py index 31c8e0105..8f8ea33b0 100644 --- a/l10n_CM/run_l10n.py +++ b/l10n_CM/run_l10n.py @@ -39,7 +39,8 @@ "yellowkorner", "wish", "bijoubrigitte", - "whittard" + "whittard", + "movieposters", } loaded_valid_sites = valid_l10n_mappings().keys() diff --git a/l10n_CM/sites/movieposters/CA/movieposters_ad.html b/l10n_CM/sites/movieposters/CA/movieposters_ad.html new file mode 100644 index 000000000..bdc2428d7 --- /dev/null +++ b/l10n_CM/sites/movieposters/CA/movieposters_ad.html @@ -0,0 +1,3 @@ +Information - Movieposters.com - Checkout
Skip to content

Information

Redeem your Movie Credits

Log into view your points balance and discover rewards available for redemption.

Express checkout

OR

Contact

Log in
97% of our posters ship within 24 hours

Delivery method

Choose a delivery method

Shipping address

CA
\ No newline at end of file diff --git a/l10n_CM/sites/movieposters/CA/movieposters_cc.html b/l10n_CM/sites/movieposters/CA/movieposters_cc.html new file mode 100644 index 000000000..566549bdf --- /dev/null +++ b/l10n_CM/sites/movieposters/CA/movieposters_cc.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file From 90735f92672ea2b0fd8bed472d50b775dc9aa50a Mon Sep 17 00:00:00 2001 From: soncuteanca Date: Wed, 6 Aug 2025 08:46:27 +0300 Subject: [PATCH 2/8] Rearange sites for better tracking --- l10n_CM/region/CA.json | 9 +++++---- l10n_CM/region/DE.json | 8 ++++++-- l10n_CM/region/FR.json | 6 +++++- l10n_CM/region/GB.json | 9 ++++----- l10n_CM/region/US.json | 12 ++++++------ l10n_CM/run_l10n.py | 44 ++++++++++++++++++++---------------------- 6 files changed, 47 insertions(+), 41 deletions(-) diff --git a/l10n_CM/region/CA.json b/l10n_CM/region/CA.json index c93222630..e2245df8d 100644 --- a/l10n_CM/region/CA.json +++ b/l10n_CM/region/CA.json @@ -2,13 +2,14 @@ "region": "CA", "sites": [ "amazon", - "walmart", + "calvinklein", + "canadatire", "demo", + "ebay", "etsy", + "movieposters", "newbalance", - "canadatire", - "ebay", - "movieposters" + "walmart" ], "tests": [ ] diff --git a/l10n_CM/region/DE.json b/l10n_CM/region/DE.json index c2e863987..d841f9293 100644 --- a/l10n_CM/region/DE.json +++ b/l10n_CM/region/DE.json @@ -2,10 +2,14 @@ "region": "DE", "sites": [ "amazon", - "mediamarkt", + "bijoubrigitte", "demo", + "ebay", "justspices", - "bijoubrigitte" + "mediamarkt", + "newbalance", + "thomann", + "zalando" ], "tests": [ ] diff --git a/l10n_CM/region/FR.json b/l10n_CM/region/FR.json index 931b3821d..77c26348e 100644 --- a/l10n_CM/region/FR.json +++ b/l10n_CM/region/FR.json @@ -2,8 +2,12 @@ "region": "FR", "sites": [ "amazon", - "demo", "artsper", + "cdiscount", + "decathlon", + "demo", + "ebay", + "vans", "yellowkorner" ], "tests": [ diff --git a/l10n_CM/region/GB.json b/l10n_CM/region/GB.json index 1e33ea6ab..60ddd5b28 100644 --- a/l10n_CM/region/GB.json +++ b/l10n_CM/region/GB.json @@ -1,13 +1,12 @@ { "region": "GB", "sites": [ - "ebay", + "assos", "demo", - "peacocks", - "whittard", "diy", - "demo", - "assos" + "ebay", + "peacocks", + "whittard" ], "tests": [ ] diff --git a/l10n_CM/region/US.json b/l10n_CM/region/US.json index f6acd3025..cd8b8132b 100644 --- a/l10n_CM/region/US.json +++ b/l10n_CM/region/US.json @@ -1,16 +1,16 @@ { "region": "US", "sites": [ + "aldoshoes", "amazon", - "walmart", - "lowes", - "etsy", - "calvinklein", + "apple", "bestbuy", + "calvinklein", "demo", + "etsy", + "lowes", "newegg", - "aldoshoes", - "apple", + "walmart", "wish" ], "tests": [] diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py index e74190b27..d3f7753de 100644 --- a/l10n_CM/run_l10n.py +++ b/l10n_CM/run_l10n.py @@ -17,37 +17,35 @@ flag_with_parameter = {"-n", "--reruns"} valid_region = {"US", "CA", "DE", "FR", "IT", "GB"} valid_sites = { - "demo", + "aldoshoes", "amazon", - "walmart", - "mediamarkt", - "lowes", - "etsy", - "calvinklein", + "apple", + "artsper", + "assos", "bestbuy", + "bijoubrigitte", + "calvinklein", + "canadatire", + "cdiscount", "decathlon", - "newegg", - "vans", + "demo", + "diy", "ebay", - "newbalance", - "zalando", - "cdiscount", - "aldoshoes", - "canadatire", - "apple", - "thomann", - "wish", - "artsper", + "etsy", "justspices", - "yellowkorner", - "wish", - "bijoubrigitte", - "whittard", + "lowes", + "mediamarkt", "movieposters", + "newbalance", + "newegg", "peacocks", + "thomann", + "vans", + "walmart", "whittard", - "diy", - "assos", + "wish", + "yellowkorner", + "zalando", } loaded_valid_sites = valid_l10n_mappings().keys() From 2df0cf0c59d56656e2b6341d0bd0bd606aae46b0 Mon Sep 17 00:00:00 2001 From: soncuteanca Date: Wed, 6 Aug 2025 08:49:22 +0300 Subject: [PATCH 3/8] Adjust fixture with the default state --- l10n_CM/Unified/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_CM/Unified/conftest.py b/l10n_CM/Unified/conftest.py index efd9e4ce6..70f41c11a 100644 --- a/l10n_CM/Unified/conftest.py +++ b/l10n_CM/Unified/conftest.py @@ -42,12 +42,12 @@ def get_html_files(live_site, region): @pytest.fixture() def region(): - return os.environ.get("FX_REGION", "CA") + return os.environ.get("FX_REGION", "US") @pytest.fixture() def live_site(): - return os.environ.get("CM_SITE", "movieposters") + return os.environ.get("CM_SITE", "demo") @pytest.fixture() From 9c4134723a6febdef6ff27aed9bf6833d3c8782f Mon Sep 17 00:00:00 2001 From: soncuteanca Date: Wed, 6 Aug 2025 08:50:17 +0300 Subject: [PATCH 4/8] Remove comma From 64d29dc90f1b1ca232353313101581da312f1073 Mon Sep 17 00:00:00 2001 From: soncuteanca Date: Wed, 6 Aug 2025 08:51:06 +0300 Subject: [PATCH 5/8] Remove comma From 115b8670bec45c6bc93edf0099c9445b6cfc321a Mon Sep 17 00:00:00 2001 From: soncuteanca Date: Wed, 6 Aug 2025 12:39:19 +0300 Subject: [PATCH 6/8] Some changes --- l10n_CM/constants/movieposters/CA/movieposters_ad.json | 1 - modules/browser_object_autofill_popup.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/l10n_CM/constants/movieposters/CA/movieposters_ad.json b/l10n_CM/constants/movieposters/CA/movieposters_ad.json index ca4c32633..b92522b78 100644 --- a/l10n_CM/constants/movieposters/CA/movieposters_ad.json +++ b/l10n_CM/constants/movieposters/CA/movieposters_ad.json @@ -8,7 +8,6 @@ "address_level_2": "3ee2821f-8f38-4a9d-b95c-e3f62b4ea69e", "address_level_1": "ecbdd508-3d94-45ec-97b5-c2b642dc3fe6", "postal_code": "f60c786d-a9bb-41af-ac0f-bff95bb7d3ad", - "country" : "c02b72d4-ba59-4c54-bd27-b4b686cc9133", "telephone": "c11c59df-db4e-459a-9590-4798a6d22030", "email": "5f14e679-8b86-4b2d-98ab-0746f1902eca" diff --git a/modules/browser_object_autofill_popup.py b/modules/browser_object_autofill_popup.py index 400d1b109..d1c59ac4f 100644 --- a/modules/browser_object_autofill_popup.py +++ b/modules/browser_object_autofill_popup.py @@ -45,7 +45,10 @@ def ensure_autofill_dropdown_visible(self, field_element: WebElement = None): field_element: if field element is given. check whether it is a select element. pass the check if it is. """ - self.element_visible("select-form-option") + self.element_exists("pop-up-component") + popup_component = self.get_element("pop-up-component") + if popup_component: + self.element_visible("select-form-option") return self # Interaction with popup elements From cdbfc7478b31ff9ed5d46be1dbeb567b6548f219 Mon Sep 17 00:00:00 2001 From: soncuteanca Date: Thu, 7 Aug 2025 13:48:40 +0300 Subject: [PATCH 7/8] Skip Linux and Windows for now due to ci artifacts --- l10n_CM/constants/movieposters/CA/movieposters_ad.json | 3 ++- l10n_CM/constants/movieposters/CA/movieposters_cc.json | 3 ++- l10n_CM/run_l10n.py | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/l10n_CM/constants/movieposters/CA/movieposters_ad.json b/l10n_CM/constants/movieposters/CA/movieposters_ad.json index b92522b78..49549a676 100644 --- a/l10n_CM/constants/movieposters/CA/movieposters_ad.json +++ b/l10n_CM/constants/movieposters/CA/movieposters_ad.json @@ -26,5 +26,6 @@ "c11c59df-db4e-459a-9590-4798a6d22030", "5f14e679-8b86-4b2d-98ab-0746f1902eca" - ] + ], + "skip_os": ["Linux", "Windows"] } \ No newline at end of file diff --git a/l10n_CM/constants/movieposters/CA/movieposters_cc.json b/l10n_CM/constants/movieposters/CA/movieposters_cc.json index 5e5a06e5c..ab962708c 100644 --- a/l10n_CM/constants/movieposters/CA/movieposters_cc.json +++ b/l10n_CM/constants/movieposters/CA/movieposters_cc.json @@ -11,5 +11,6 @@ "11111111-aaaa-bbbb-cccc-000000000000", "22222222-bbbb-cccc-dddd-111111111111", "33333333-cccc-dddd-eeee-222222222222" - ] + ], + "skip_os": ["Linux", "Windows"] } diff --git a/l10n_CM/run_l10n.py b/l10n_CM/run_l10n.py index c09ab813a..afb83fe45 100644 --- a/l10n_CM/run_l10n.py +++ b/l10n_CM/run_l10n.py @@ -24,8 +24,7 @@ "assos", "bestbuy", "bijoubrigitte", - "burtsbees" - "calvinklein", + "burtsbeescalvinklein", "canadatire", "cdiscount", "decathlon", @@ -47,7 +46,7 @@ "whittard", "wish", "yellowkorner", - "zalando" + "zalando", } loaded_valid_sites = valid_l10n_mappings().keys() From e1cc5331d58365660db5921fc512cff0e5f58c8f Mon Sep 17 00:00:00 2001 From: Philimon Derib Ayalew Date: Mon, 11 Aug 2025 16:34:38 +0200 Subject: [PATCH 8/8] revert and add --- l10n_CM/region/CA.json | 11 +++++------ l10n_CM/region/DE.json | 8 ++------ l10n_CM/region/FR.json | 8 ++------ l10n_CM/region/GB.json | 8 ++++---- l10n_CM/region/US.json | 12 ++++++------ 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/l10n_CM/region/CA.json b/l10n_CM/region/CA.json index d5ead53b7..f397a8d1f 100644 --- a/l10n_CM/region/CA.json +++ b/l10n_CM/region/CA.json @@ -2,15 +2,14 @@ "region": "CA", "sites": [ "amazon", - "calvinklein", - "canadatire", + "walmart", "demo", - "ebay", "etsy", - "movieposters", "newbalance", - "walmart", - "burtsbees" + "canadatire", + "ebay", + "burtsbees", + "movieposters" ], "tests": [ ] diff --git a/l10n_CM/region/DE.json b/l10n_CM/region/DE.json index d841f9293..c2e863987 100644 --- a/l10n_CM/region/DE.json +++ b/l10n_CM/region/DE.json @@ -2,14 +2,10 @@ "region": "DE", "sites": [ "amazon", - "bijoubrigitte", + "mediamarkt", "demo", - "ebay", "justspices", - "mediamarkt", - "newbalance", - "thomann", - "zalando" + "bijoubrigitte" ], "tests": [ ] diff --git a/l10n_CM/region/FR.json b/l10n_CM/region/FR.json index 81fde4e38..e2d9b0506 100644 --- a/l10n_CM/region/FR.json +++ b/l10n_CM/region/FR.json @@ -2,14 +2,10 @@ "region": "FR", "sites": [ "amazon", - "artsper", - "cdiscount", - "decathlon", "demo", - "ebay", - "vans", - "yellowkorner", + "artsper", "fnac", + "yellowkorner" ], "tests": [ ] diff --git a/l10n_CM/region/GB.json b/l10n_CM/region/GB.json index 0e1ed409a..ddf48b57e 100644 --- a/l10n_CM/region/GB.json +++ b/l10n_CM/region/GB.json @@ -1,12 +1,12 @@ { "region": "GB", "sites": [ - "assos", - "demo", - "diy", "ebay", + "demo", "peacocks", - "whittard" + "whittard", + "diy", + "assos" ], "tests": [ ] diff --git a/l10n_CM/region/US.json b/l10n_CM/region/US.json index cd8b8132b..f6acd3025 100644 --- a/l10n_CM/region/US.json +++ b/l10n_CM/region/US.json @@ -1,16 +1,16 @@ { "region": "US", "sites": [ - "aldoshoes", "amazon", - "apple", - "bestbuy", + "walmart", + "lowes", + "etsy", "calvinklein", + "bestbuy", "demo", - "etsy", - "lowes", "newegg", - "walmart", + "aldoshoes", + "apple", "wish" ], "tests": []