Merge pull request #3406 from SalesforceCommerceCloud/develop

update feature branch `bonus-products-rule-based-v3` with develop branch

Author: sf-shikhar-prasoon

.github/workflows/e2e.yml

@@ -11,18 +11,14 @@ jobs:
       fail-fast: false
       matrix:
         # Run all matrix env at once because we will not deploy demo app to MRT.
-        node: [18, 20, 22]
-        npm: [8, 9, 10, 11]
-        exclude: # node 18 with npm 11 is not compatible
-          - node: 18
-            npm: 11
+        node: [20, 22]
+        npm: [10, 11]
     runs-on: ubuntu-latest
     env:
       # The "default" npm is the one that ships with a given version of node.
       # For more: https://nodejs.org/en/download/releases/
       # (We also use this env var for making sure a step runs once for the current node version)
-      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
-      IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
+      IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -67,18 +63,14 @@ jobs:
       max-parallel: 1
       matrix:
         # Run all matrix env at once because we will not deploy demo app to MRT.
-        node: [18, 20, 22]
-        npm: [8, 9, 10, 11]
-        exclude: # node 18 with npm 11 is not compatible
-          - node: 18
-            npm: 11
+        node: [20, 22]
+        npm: [10, 11]
     runs-on: ubuntu-latest
     env:
       # The "default" npm is the one that ships with a given version of node.
       # For more: https://nodejs.org/en/download/releases/
       # (We also use this env var for making sure a step runs once for the current node version)
-      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
-      IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
+      IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
 
     steps:
       - name: Checkout
@@ -183,18 +175,14 @@ jobs:
       max-parallel: 1
       matrix:
         # Run all matrix env at once because we will not deploy demo app to MRT.
-        node: [18, 20, 22]
-        npm: [8, 9, 10, 11]
-        exclude: # node 18 with npm 11 is not compatible
-          - node: 18
-            npm: 11
+        node: [20, 22]
+        npm: [10, 11]
     runs-on: ubuntu-latest
     env:
       # The "default" npm is the one that ships with a given version of node.
       # For more: https://nodejs.org/en/download/releases/
       # (We also use this env var for making sure a step runs once for the current node version)
-      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
-      IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
+      IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
       # The current recommended version for Managed Runtime:
       # https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
       IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 11 }}
@@ -303,18 +291,14 @@ jobs:
       max-parallel: 1
       matrix:
           # Run all matrix env at once because we will not deploy demo app to MRT.
-          node: [18, 20, 22]
-          npm: [8, 9, 10, 11]
-          exclude: # node 18 with npm 11 is not compatible
-            - node: 18
-              npm: 11
+          node: [20, 22]
+          npm: [10, 11]
     runs-on: ubuntu-latest
     env:
       # The "default" npm is the one that ships with a given version of node.
       # For more: https://nodejs.org/en/download/releases/
       # (We also use this env var for making sure a step runs once for the current node version)
-      # Note: For node 18, the default was npm 9 until v18.19.0, when it became npm 10
-      IS_DEFAULT_NPM: ${{ (matrix.node == 18 && matrix.npm == 10) || (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
+      IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

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

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

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

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

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

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

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

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

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

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

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

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

e2e/tests/a11y/desktop/slas-private-client/__snapshots__/registered/checkout-a11y-violations-step-2.json

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

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

@@ -15,22 +15,6 @@
       }
     ]
   },
-  {
-    "id": "page-has-heading-one",
-    "impact": "moderate",
-    "description": "Ensure that the page, or at least one of its frames contains a level-one heading",
-    "help": "Page should contain a level-one heading",
-    "helpUrl": "https://dequeuniversity.com/rules/axe/4.10/page-has-heading-one?application=playwright",
-    "nodes": [
-      {
-        "html": "<html lang=\"en-US\" class=\"...\"   >",
-        "failureSummary": "Fix all of the following:\n  Page must have a level-one heading",
-        "target": [
-          "html"
-        ]
-      }
-    ]
-  },
   {
     "id": "region",
     "impact": "moderate",

e2e/tests/mobile/dnt.spec.js

@@ -73,7 +73,7 @@ test('Shopper can use the consent tracking form', async ({page}) => {
     await checkDntCookie(page, '1')
 
     // Logging out clears the preference
-    await page.getByRole('heading', {name: /My Account/i}).click()
+    await page.getByRole('button', {name: /My Account chevron-down/i}).click()
     const buttons = await page.getByText(/Log Out/i).elementHandles()
     for (const button of buttons) {
         if (await button.isVisible()) {