Merge pull request #331 from adobe/dev

Sync dev to main before release
adobe · Jul 18, 2024 · 370f132 · 370f132
2 parents 6539d97 + 06b1ef7
commit 370f132
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,14 +2,14 @@ version: 2.1
 
 orbs:
   codecov: codecov/codecov@1.1.1
-  browser-tools: circleci/browser-tools@1.4.4
+  browser-tools: circleci/browser-tools@1.4.8
 
 common:
   integration_test_steps: &integration_test_steps
     steps:
       - checkout
-      - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.96 # TODO: remove -> https://github.com/CircleCI-Public/browser-tools-orb/issues/75
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
       - restore_cache:
           keys:
             - maven-repo-{{ .Environment.CACHE_VERSION }}-its-{{ arch }}-{{ .Branch }}-{{ checksum "pom.xml" }}

diff --git a/pom.xml b/pom.xml
@@ -87,7 +87,7 @@
         <vault.user>admin</vault.user>
         <vault.password>admin</vault.password>
         <core.wcm.components.version>2.18.6</core.wcm.components.version>
-        <core.cif.components.version>2.13.2</core.cif.components.version>
+        <core.cif.components.version>2.14.0</core.cif.components.version>
         <graphql.client.version>1.7.10</graphql.client.version>
         <magento.graphql.version>9.1.0-magento242ee</magento.graphql.version>
         <bnd.version>5.1.2</bnd.version>

diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json
diff --git a/ui.frontend/package.json b/ui.frontend/package.json
@@ -87,8 +87,8 @@
     "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "@adobe/aem-core-cif-product-recs-extension": "2.13.2",
-    "@adobe/aem-core-cif-react-components": "2.13.2",
+    "@adobe/aem-core-cif-product-recs-extension": "2.14.0",
+    "@adobe/aem-core-cif-react-components": "2.14.0",
     "@apollo/client": "^3.5.5",
     "@babel/runtime": "^7.4.5",
     "@magento/peregrine": "11.0.0",

diff --git a/ui.tests/test-module/package.json b/ui.tests/test-module/package.json
@@ -16,7 +16,7 @@
     "@wdio/junit-reporter": "7.7.0",
     "@wdio/local-runner": "7.7.2",
     "@wdio/mocha-framework": "7.7.2",
-    "@wdio/selenium-standalone-service": "7.7.0",
+    "@wdio/selenium-standalone-service": "7.33.0",
     "@wdio/spec-reporter": "7.7.0",
     "@wdio/sync": "7.7.2",
     "chai": "4.3.4",

diff --git a/ui.tests/test-module/specs/venia/commerceteasser-dialog.js b/ui.tests/test-module/specs/venia/commerceteasser-dialog.js
@@ -228,7 +228,7 @@ describe('Commerce Teaser Component Dialog', function () {
         expect(actionFields[0].$('foundation-autocomplete input[name="./actions/item0/link"')).toHaveValue('');
 
         browser.CIFSelectCategory(actionFields[3].$('category-field'), 'Tops');
-        expect(actionFields[3].$('input[name="./actions/item0/categoryId"')).toHaveValue('MTk=');
+        expect(actionFields[3].$('input[name="./actions/item0/categoryId"')).toHaveValue('MjA=');
         expect(actionFields[2].$('input[name="./actions/item0/productSku"')).toHaveValue('');
 
         browser.GraniteSelectPath(actionFields[0].$('foundation-autocomplete'), 'Venia Demo Store');