From 9493ae05dcbc6fb980393227d6bee2c4c21f1349 Mon Sep 17 00:00:00 2001 From: "vadim.malesh" Date: Thu, 9 Apr 2020 09:29:55 +0300 Subject: [PATCH 1/4] fix seeMore 1.0-develop --- .../AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml | 7 ++++--- .../Test/AdminAdobeStockImagePreviewSameSeriesTest.xml | 6 +++--- .../Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml | 7 ++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml index 40f3cfb62a6f..f382976ef2dc 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml @@ -10,9 +10,6 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - - - @@ -31,7 +28,11 @@ + + + + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml index 774f8d91f109..98c79852ffda 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml @@ -9,9 +9,6 @@ - - - @@ -31,6 +28,9 @@ + + + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml index 175ff6335101..ebfe5bb28b0c 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml @@ -10,9 +10,6 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - - - @@ -30,6 +27,10 @@ <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/> <actionGroup ref="logout" stepKey="logout"/> </after> + + <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage"> + <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/> + </actionGroup> <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandsFirstImageInGrid"/> <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/> <click selector="{{AdobeStockImagePreviewSection.moreFromThisSeriesSeeMore}}" stepKey="clickOnTabMoreForThisModel"/> From d86cefc51988fc65440402a36309cef8ae3e5471 Mon Sep 17 00:00:00 2001 From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com> Date: Thu, 9 Apr 2020 11:22:48 +0300 Subject: [PATCH 2/4] test commit --- .../Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml index f382976ef2dc..f967f41c55df 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml @@ -31,7 +31,7 @@ <grabTextFrom selector="{{AdobeStockSection.recordsFound}}" stepKey="countWithoutModelFilter"/> <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage"> - <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/> + <argument name="query" value="cars"/> </actionGroup> <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/> <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/> From 05ca8cce2737b8a66b6b5d7d0b3573153e638117 Mon Sep 17 00:00:00 2001 From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com> Date: Thu, 9 Apr 2020 13:22:34 +0300 Subject: [PATCH 3/4] revert test change --- .../Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml index f967f41c55df..f382976ef2dc 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml @@ -31,7 +31,7 @@ <grabTextFrom selector="{{AdobeStockSection.recordsFound}}" stepKey="countWithoutModelFilter"/> <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage"> - <argument name="query" value="cars"/> + <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/> </actionGroup> <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/> <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/> From de57e6fd558ec0cb88cd475ecc46fd6323d44e9b Mon Sep 17 00:00:00 2001 From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com> Date: Thu, 9 Apr 2020 13:34:33 +0300 Subject: [PATCH 4/4] change image data --- AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml index 3735b7d659ae..9a161bde531e 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml @@ -12,9 +12,9 @@ <data key="name" unique="suffix">my-image-</data> </entity> <entity name="AdobeStockLicensedImage"> - <data key="id">{{_ENV.ADOBE_STOCK_LICENSED_IMAGE}}</data> + <data key="id">{{_CREDS.magento/adobe_stock_licensed_image}}</data> </entity> <entity name="AdobeStockUnlicensedImage"> - <data key="id">{{_ENV.ADOBE_STOCK_UNLICENSED_IMAGE}}</data> + <data key="id">{{_CREDS.magento/adobe_stock_not_licensed_image}}</data> </entity> </entities>