Merge pull request #441 from spryker-shop/feature/cc-33308-smoke-tests

CC-33308 : Cypress smoke tests enablement.
spryker-shop · May 7, 2024 · b6a2ade · b6a2ade
2 parents 8df6db4 + f3dc4a4
commit b6a2ade
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -676,7 +676,7 @@ jobs:
             -   name: Run Tests
                 run: |
                     for i in 1 2; do
-                      docker/sdk exec --env "ENV_REPOSITORY_ID=b2b" cypress-tests npm run cy:ci:b2b && s=0 && break || s=$? && echo "Test failed, retrying..."
+                      docker/sdk exec --env "ENV_REPOSITORY_ID=b2b" cypress-tests npm run cy:ci && s=0 && break || s=$? && echo "Test failed, retrying..."
                       sleep 1
                     done
                     (exit $s)

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "spryker-feature/configurable-product": "^202404.0",
         "spryker-feature/configurable-product-shopping-lists": "^202404.0",
         "spryker-feature/customer-access": "^202404.0",
-        "spryker-feature/customer-account-management": "^202404.0",
+        "spryker-feature/customer-account-management": "dev-master as 202407.0",
         "spryker-feature/data-exchange-api": "^202404.0",
         "spryker-feature/deployment-tools": "^202404.0",
         "spryker-feature/file-manager": "^202404.0",

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Pyz/Yves/CheckoutPage/Theme/default/views/shipment/shipment.twig b/src/Pyz/Yves/CheckoutPage/Theme/default/views/shipment/shipment.twig
@@ -39,7 +39,7 @@
                         {% do shipmentGroupForm.hash.setRendered %}
                     {% endif %}
 
-                    <article class="col col--sm-12 grid grid--gap spacing-bottom spacing-bottom--big">
+                    <article class="col col--sm-12 grid grid--gap spacing-bottom spacing-bottom--big" data-qa="multi-shipment-group">
                         <h3 class="col col--sm-12 title title--second spacing-bottom spacing-bottom--small">
                             {{ 'page.checkout.shipment.shipment_group_heading' | trans({
                                 '%current%': loop.index | executeFilterIfExists('formatInt', app.locale),