Skip to content

Commit e507c35

Browse files
authored
Merge branch 'develop' into W-20223950-add-config-passkey-login
2 parents e7dff31 + 4de195b commit e507c35

File tree

169 files changed

+7173
-2129
lines changed

Some content is hidden

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

169 files changed

+7173
-2129
lines changed

.github/workflows/e2e-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,4 @@ jobs:
219219
# This is used by the e2e tests to run the tests against the MRT target.
220220
export RETAIL_APP_HOME="https://${{ github.event_name == 'workflow_dispatch' && github.event.inputs.mrt_target_external_hostname || steps.mrt_target_details.outputs.ssrExternalHostname }}"
221221
echo "RETAIL_APP_HOME environment variable value: $RETAIL_APP_HOME"
222-
npx playwright test --project=chromium --project=mobile-chrome --project=a11y-mobile-slas-private-client --project=a11y-desktop-slas-private-client --workers=4
222+
npx playwright test --project=chromium --project=mobile-chrome --project=a11y-mobile --project=a11y-desktop --workers=4

.github/workflows/e2e.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ jobs:
183183
# For more: https://nodejs.org/en/download/releases/
184184
# (We also use this env var for making sure a step runs once for the current node version)
185185
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
186-
# The current recommended version for Managed Runtime:
187-
# https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
188-
IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 11 }}
189186
steps:
190187
- name: Checkout
191188
uses: actions/checkout@v4
@@ -251,11 +248,6 @@ jobs:
251248
# this will not include a11y tests
252249
- name: Run Playwright tests
253250
run: npm run test:e2e
254-
255-
- name: Run a11y test for Node 22 with npm 11
256-
if: env.IS_MRT_NODE == 'true'
257-
run: npm run test:e2e:a11y:slas-public-client
258-
259251
notify-slack-pwa-ext:
260252
needs: [run-generator-retail-app-ext]
261253
if: ${{ always() }}
@@ -299,6 +291,9 @@ jobs:
299291
# For more: https://nodejs.org/en/download/releases/
300292
# (We also use this env var for making sure a step runs once for the current node version)
301293
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
294+
# The current recommended version for Managed Runtime:
295+
# https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
296+
IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 11 }}
302297
steps:
303298
- name: Checkout
304299
uses: actions/checkout@v4
@@ -370,6 +365,9 @@ jobs:
370365
- name: Run Playwright tests
371366
run: npm run test:e2e
372367

368+
- name: Run a11y test for Node 22 with npm 11
369+
if: env.IS_MRT_NODE == 'true'
370+
run: npm run test:e2e:a11y
373371
notify-slack-pwa-private-client:
374372
needs: [run-generator-private-client]
375373
if: ${{ always() }}

.github/workflows/test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ jobs:
8484
- name: Setup Ubuntu Machine
8585
uses: "./.github/actions/setup_ubuntu"
8686

87+
# Running `git commit`, for example, requires these user.name and user.email to be set
88+
- name: Configure Git
89+
run: |-
90+
git config --global user.name ${{ secrets.GIT_CONFIG_USERNAME }}
91+
git config --global user.email ${{ secrets.GIT_CONFIG_EMAIL }}
92+
8793
- name: Run unit tests
8894
uses: "./.github/actions/unit_tests"
8995

e2e/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "e2e-scripts",
3-
"version": "3.14.0-dev",
3+
"version": "3.15.0-dev",
44
"description": "E2E test scripts for PWA Kit",
55
"main": "index.js",
66
"private": true,
@@ -15,7 +15,7 @@
1515
"@actions/core": "^1.11.1",
1616
"@aws-sdk/client-s3": "^3.450.0",
1717
"@aws-sdk/client-sts": "^3.450.0",
18-
"@salesforce/pwa-kit-dev": "3.14.0-dev",
18+
"@salesforce/pwa-kit-dev": "3.15.0-dev",
1919
"jest": "^26.6.3"
2020
},
2121
"jest": {

e2e/tests/a11y/desktop/slas-private-client/__snapshots__/guest/cart-a11y-violations.json renamed to e2e/tests/a11y/desktop/__snapshots__/guest/cart-a11y-violations.json

File renamed without changes.

e2e/tests/a11y/desktop/slas-private-client/__snapshots__/guest/checkout-a11y-violations-step-0.json renamed to e2e/tests/a11y/desktop/__snapshots__/guest/checkout-a11y-violations-step-0.json

File renamed without changes.

e2e/tests/a11y/desktop/slas-private-client/__snapshots__/guest/checkout-a11y-violations-step-1.json renamed to e2e/tests/a11y/desktop/__snapshots__/guest/checkout-a11y-violations-step-1.json

File renamed without changes.

e2e/tests/a11y/desktop/slas-private-client/__snapshots__/guest/checkout-a11y-violations-step-3.json renamed to e2e/tests/a11y/desktop/__snapshots__/guest/checkout-a11y-violations-step-3.json

File renamed without changes.

e2e/tests/a11y/desktop/slas-private-client/__snapshots__/guest/checkout-a11y-violations-step-4-order-confirmation.json renamed to e2e/tests/a11y/desktop/__snapshots__/guest/checkout-a11y-violations-step-4-order-confirmation.json

File renamed without changes.

0 commit comments

Comments
 (0)