Skip to content

Commit bbc6af3

Browse files
Hani YacoubHani Yacoub
Hani Yacoub
authored and
Hani Yacoub
committed
Merge main
2 parents f5fbf8f + 53893b9 commit bbc6af3

File tree

10 files changed

+91
-50
lines changed

10 files changed

+91
-50
lines changed

‎.github/workflows/l10n.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,8 @@ jobs:
4444
if: ${{ inputs.job_to_run == 'L10N-MacOS' || inputs.mac_installer_link }}
4545
runs-on: macos-latest
4646
steps:
47-
- name: Create app token
48-
uses: actions/create-github-app-token@v1
49-
id: app-token
50-
with:
51-
app-id: ${{ secrets.BOT_CLIENT_ID }}
52-
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
5347
- name: Checkout repository
5448
uses: actions/checkout@v4
55-
with:
56-
token: ${{ steps.app-token.outputs.token }}
5749
- name: Set up Python 3.11
5850
uses: actions/setup-python@v5
5951
with:
@@ -129,16 +121,8 @@ jobs:
129121
if: ${{ inputs.job_to_run == 'L10N-Linux' || inputs.linux_tarball_link }}
130122
runs-on: ubuntu-latest
131123
steps:
132-
- name: Create app token
133-
uses: actions/create-github-app-token@v1
134-
id: app-token
135-
with:
136-
app-id: ${{ secrets.BOT_CLIENT_ID }}
137-
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
138124
- name: Checkout repository
139125
uses: actions/checkout@v4
140-
with:
141-
token: ${{ steps.app-token.outputs.token }}
142126
- name: Set up Python 3.11
143127
uses: actions/setup-python@v5
144128
with:
@@ -212,16 +196,8 @@ jobs:
212196
if: ${{ inputs.job_to_run == 'L10N-Windows' || inputs.win_installer_link }}
213197
runs-on: windows-latest
214198
steps:
215-
- name: Create app token
216-
uses: actions/create-github-app-token@v1
217-
id: app-token
218-
with:
219-
app-id: ${{ secrets.BOT_CLIENT_ID }}
220-
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
221199
- name: Checkout repository
222200
uses: actions/checkout@v4
223-
with:
224-
token: ${{ steps.app-token.outputs.token }}
225201
- name: Set up Python 3.11
226202
uses: actions/setup-python@v5
227203
with:

‎.github/workflows/smoke.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,8 @@ jobs:
4343
if: ${{ inputs.job_to_run == 'Smoke-Windows' || inputs.win_installer_link }}
4444
runs-on: windows-latest
4545
steps:
46-
- name: Create app token
47-
uses: actions/create-github-app-token@v1
48-
id: app-token
49-
with:
50-
app-id: ${{ secrets.BOT_CLIENT_ID }}
51-
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
5246
- name: Checkout repository
5347
uses: actions/checkout@v4
54-
with:
55-
token: ${{ steps.app-token.outputs.token }}
5648
- name: Set up Python 3.11
5749
uses: actions/setup-python@v5
5850
with:
@@ -152,16 +144,8 @@ jobs:
152144
if: ${{ inputs.job_to_run == 'Smoke-MacOS' || inputs.mac_installer_link }}
153145
runs-on: macos-latest
154146
steps:
155-
- name: Create app token
156-
uses: actions/create-github-app-token@v1
157-
id: app-token
158-
with:
159-
app-id: ${{ secrets.BOT_CLIENT_ID }}
160-
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
161147
- name: Checkout repository
162148
uses: actions/checkout@v4
163-
with:
164-
token: ${{ steps.app-token.outputs.token }}
165149
- name: Set up Python 3.11
166150
uses: actions/setup-python@v5
167151
with:
@@ -226,16 +210,8 @@ jobs:
226210
if: ${{ inputs.linux_tarball_link }}
227211
runs-on: ubuntu-latest
228212
steps:
229-
- name: Create app token
230-
uses: actions/create-github-app-token@v1
231-
id: app-token
232-
with:
233-
app-id: ${{ secrets.BOT_CLIENT_ID }}
234-
private-key: ${{ secrets.BOT_PRIVATE_KEY }}
235213
- name: Checkout repository
236214
uses: actions/checkout@v4
237-
with:
238-
token: ${{ steps.app-token.outputs.token }}
239215
- name: Set up Python 3.11
240216
uses: actions/setup-python@v5
241217
with:

‎l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
2323
C2888704 - Verify phone/email data are captured in the Capture Doorhanger and stored in about:preferences
2424
"""
2525
if not is_live_site:
26+
# Skip for PL region due to Firefox doorhanger bug where phone field doesn't appear
27+
if region == "PL":
28+
pytest.skip(
29+
"Phone field not displayed in doorhanger during automated testing for PL region"
30+
)
31+
2632
# Create fake data and fill it in
2733
address_autofill.open()
2834

‎l10n_CM/constants/tiffany/IT/tiffany_ad.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"url": "http://127.0.0.1:8080/tiffany_ad.html",
3+
"field_mapping": {
4+
"given_name": "49a1a737-4c43-4734-8eca-d7003b79e161",
5+
"family_name": "1d7d5f3f-d66a-477a-8f32-cfa102b0c36a",
6+
"address_level_1": "3dd7e188-ec6c-43d9-ae4e-9d11515704b4",
7+
"address_level_2": "b1346a12-09d9-44bd-ab9d-32320c08920f",
8+
"telephone": "b49283ef-6ded-4302-bb57-e4fad796eff6"
9+
},
10+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
11+
"fields": [
12+
"49a1a737-4c43-4734-8eca-d7003b79e161",
13+
"1d7d5f3f-d66a-477a-8f32-cfa102b0c36a",
14+
"3dd7e188-ec6c-43d9-ae4e-9d11515704b4",
15+
"b1346a12-09d9-44bd-ab9d-32320c08920f",
16+
"b49283ef-6ded-4302-bb57-e4fad796eff6"
17+
],
18+
"skipped": ["test_demo_ad_3a_autofill_address_fields.py"]
19+
}

‎l10n_CM/constants/tiffany/IT/tiffany_cc.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"url": "http://127.0.0.1:8080/tiffany_cc.html",
3+
"field_mapping": {
4+
"card_number": "11111111-aaaa-bbbb-cccc-000000000000",
5+
"expiration_date": "22222222-bbbb-cccc-dddd-111111111111",
6+
"cvv": "33333333-cccc-dddd-eeee-222222222222"
7+
},
8+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
9+
"skip": "True",
10+
"fields": [
11+
"11111111-aaaa-bbbb-cccc-000000000000",
12+
"22222222-bbbb-cccc-dddd-111111111111",
13+
"33333333-cccc-dddd-eeee-222222222222"
14+
]
15+
}

‎l10n_CM/region/IT.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"region": "IT",
33
"sites": [
4-
"ebay"
4+
"ebay",
5+
"tiffany"
56
],
67
"tests": [
78
]

‎l10n_CM/region/PL.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"region": "PL",
3+
"sites": [
4+
"demo"
5+
],
6+
"tests": [
7+
]
8+
}

‎l10n_CM/run_l10n.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
current_dir = os.path.dirname(__file__)
1616
valid_flags = {"--run-headless", "-n", "--reruns", "--fx-executable", "--ci"}
1717
flag_with_parameter = {"-n", "--reruns"}
18-
valid_region = {"US", "CA", "DE", "FR", "IT", "GB", "ES"}
18+
valid_region = {"US", "CA", "DE", "FR", "IT", "GB", "PL", "ES"}
1919
valid_sites = {
2020
"demo",
2121
"amazon",
@@ -45,6 +45,7 @@
4545
"peacocks",
4646
"whittard",
4747
"diy",
48+
"tiffany",
4849
"assos",
4950
}
5051

‎l10n_CM/sites/tiffany/IT/tiffany_ad.html

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

‎l10n_CM/sites/tiffany/IT/tiffany_cc.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>Title</title>
6+
</head>
7+
<body>
8+
9+
</body>
10+
</html>

0 commit comments

Comments
 (0)