From a3254ae49b7f5b2e59154ba890de0df8a8a74764 Mon Sep 17 00:00:00 2001 From: Dirk Rudolph Date: Thu, 26 Aug 2021 14:21:06 +0200 Subject: [PATCH 1/5] update base image and tests --- .circleci/config.yml | 2 +- ui.tests/test-module/specs/venia/catalog-page-dialogs.js | 4 ++-- ui.tests/test-module/specs/venia/xf-page-dialogs.js | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7736f848..94882415 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ executors: docker: - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.4-azul-jdk11 <<: *docker_auth - - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5607-azul + - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5770-azul <<: *docker_auth test_executor_655: docker: diff --git a/ui.tests/test-module/specs/venia/catalog-page-dialogs.js b/ui.tests/test-module/specs/venia/catalog-page-dialogs.js index 7cbbece9..6ecca232 100644 --- a/ui.tests/test-module/specs/venia/catalog-page-dialogs.js +++ b/ui.tests/test-module/specs/venia/catalog-page-dialogs.js @@ -53,9 +53,9 @@ describe('Catalog Page Component Dialog', function () { expect(commerceTab).toBeDisplayed(); commerceTab.click(); - expect($('h3=Catalog Page')).toBeDisplayed(); + expect($('h2=Catalog Page')).toBeDisplayed(); expect($('coral-checkbox-label=Show catalog page')).toBeDisplayed(); - expect($('h3=Magento Store Configuration')).toBeDisplayed(); + expect($('h2=Magento Store Configuration')).toBeDisplayed(); expect($('label=Root Category Identifier')).toBeDisplayed(); }); }); diff --git a/ui.tests/test-module/specs/venia/xf-page-dialogs.js b/ui.tests/test-module/specs/venia/xf-page-dialogs.js index 93747265..cf8dfde9 100644 --- a/ui.tests/test-module/specs/venia/xf-page-dialogs.js +++ b/ui.tests/test-module/specs/venia/xf-page-dialogs.js @@ -53,9 +53,9 @@ describe('XF Page Component Dialog', function () { expect(commerceTab).toBeDisplayed(); commerceTab.click(); - expect($('h3=Commerce Pages')).toBeDisplayed(); - expect($('h3=Product selection')).toBeDisplayed(); - expect($('h3=Category selection')).toBeDisplayed(); - expect($('h3=Catalog placeholder location')).toBeDisplayed(); + expect($('h2=Commerce Pages')).toBeDisplayed(); + expect($('h2=Product selection')).toBeDisplayed(); + expect($('h2=Category selection')).toBeDisplayed(); + expect($('h2=Catalog placeholder location')).toBeDisplayed(); }); }); From 7deea0be8a205610427952f85de0a7ff981b9882 Mon Sep 17 00:00:00 2001 From: Dirk Rudolph Date: Thu, 26 Aug 2021 15:08:51 +0200 Subject: [PATCH 2/5] do not assert on a particular headline tag anymore In order to be compatible to both cloud and onprem we should not assert on h2 or h3 anymore as one is used by cloud and the other on prem. --- ui.tests/test-module/specs/venia/catalog-page-dialogs.js | 4 ++-- ui.tests/test-module/specs/venia/xf-page-dialogs.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui.tests/test-module/specs/venia/catalog-page-dialogs.js b/ui.tests/test-module/specs/venia/catalog-page-dialogs.js index 6ecca232..5a4e7502 100644 --- a/ui.tests/test-module/specs/venia/catalog-page-dialogs.js +++ b/ui.tests/test-module/specs/venia/catalog-page-dialogs.js @@ -53,9 +53,9 @@ describe('Catalog Page Component Dialog', function () { expect(commerceTab).toBeDisplayed(); commerceTab.click(); - expect($('h2=Catalog Page')).toBeDisplayed(); + expect($('=Catalog Page')).toBeDisplayed(); expect($('coral-checkbox-label=Show catalog page')).toBeDisplayed(); - expect($('h2=Magento Store Configuration')).toBeDisplayed(); + expect($('=Magento Store Configuration')).toBeDisplayed(); expect($('label=Root Category Identifier')).toBeDisplayed(); }); }); diff --git a/ui.tests/test-module/specs/venia/xf-page-dialogs.js b/ui.tests/test-module/specs/venia/xf-page-dialogs.js index cf8dfde9..55d7a3d7 100644 --- a/ui.tests/test-module/specs/venia/xf-page-dialogs.js +++ b/ui.tests/test-module/specs/venia/xf-page-dialogs.js @@ -53,9 +53,9 @@ describe('XF Page Component Dialog', function () { expect(commerceTab).toBeDisplayed(); commerceTab.click(); - expect($('h2=Commerce Pages')).toBeDisplayed(); - expect($('h2=Product selection')).toBeDisplayed(); - expect($('h2=Category selection')).toBeDisplayed(); - expect($('h2=Catalog placeholder location')).toBeDisplayed(); + expect($('=Commerce Pages')).toBeDisplayed(); + expect($('=Product selection')).toBeDisplayed(); + expect($('=Category selection')).toBeDisplayed(); + expect($('=Catalog placeholder location')).toBeDisplayed(); }); }); From d206a40b4f4aab8a2993b68eb645f9d39590bafe Mon Sep 17 00:00:00 2001 From: Dirk Rudolph Date: Thu, 26 Aug 2021 16:32:19 +0200 Subject: [PATCH 3/5] update to latest snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 107e2d1f..d82f1775 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ admin admin 2.17.2 - 2.0.1-SNAPSHOT + 2.1.1-SNAPSHOT 1.7.4 9.0.0-magento242ee 5.1.2 From d31f1da56f765843f774b0a01d18235f0ce2ab36 Mon Sep 17 00:00:00 2001 From: Dirk Rudolph Date: Fri, 27 Aug 2021 08:46:03 +0200 Subject: [PATCH 4/5] fix element selectors --- ui.tests/test-module/specs/venia/catalog-page-dialogs.js | 6 +++--- ui.tests/test-module/specs/venia/xf-page-dialogs.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui.tests/test-module/specs/venia/catalog-page-dialogs.js b/ui.tests/test-module/specs/venia/catalog-page-dialogs.js index 5a4e7502..c2fce1af 100644 --- a/ui.tests/test-module/specs/venia/catalog-page-dialogs.js +++ b/ui.tests/test-module/specs/venia/catalog-page-dialogs.js @@ -53,9 +53,9 @@ describe('Catalog Page Component Dialog', function () { expect(commerceTab).toBeDisplayed(); commerceTab.click(); - expect($('=Catalog Page')).toBeDisplayed(); + expect($('.coral-Form-fieldset-legend=Catalog Page')).toBeDisplayed(); expect($('coral-checkbox-label=Show catalog page')).toBeDisplayed(); - expect($('=Magento Store Configuration')).toBeDisplayed(); - expect($('label=Root Category Identifier')).toBeDisplayed(); + expect($('.coral-Form-fieldset-legend=Magento Store Configuration')).toBeDisplayed(); + expect($('.coral-Form-fieldlabel=Root Category Identifier')).toBeDisplayed(); }); }); diff --git a/ui.tests/test-module/specs/venia/xf-page-dialogs.js b/ui.tests/test-module/specs/venia/xf-page-dialogs.js index 55d7a3d7..f7455863 100644 --- a/ui.tests/test-module/specs/venia/xf-page-dialogs.js +++ b/ui.tests/test-module/specs/venia/xf-page-dialogs.js @@ -53,9 +53,9 @@ describe('XF Page Component Dialog', function () { expect(commerceTab).toBeDisplayed(); commerceTab.click(); - expect($('=Commerce Pages')).toBeDisplayed(); - expect($('=Product selection')).toBeDisplayed(); - expect($('=Category selection')).toBeDisplayed(); - expect($('=Catalog placeholder location')).toBeDisplayed(); + expect($('.coral-Form-fieldset-legend=Commerce Pages')).toBeDisplayed(); + expect($('.coral-Form-fieldset-legend=Product selection')).toBeDisplayed(); + expect($('.coral-Form-fieldset-legend=Category selection')).toBeDisplayed(); + expect($('.coral-Form-fieldset-legend=Catalog placeholder location')).toBeDisplayed(); }); }); From a60866c95ce30976d5b97e42c1b5e3f6397089aa Mon Sep 17 00:00:00 2001 From: Dirk Rudolph Date: Fri, 27 Aug 2021 10:40:19 +0200 Subject: [PATCH 5/5] use latest public release --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 94882415..f74311e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ executors: docker: - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.4-azul-jdk11 <<: *docker_auth - - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5770-azul + - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:5743-azul <<: *docker_auth test_executor_655: docker: