From 8098028529eef7bc36f00dbcbab4349b5df46268 Mon Sep 17 00:00:00 2001 From: Adarsh Manickam Date: Mon, 4 Nov 2019 16:36:08 +0530 Subject: [PATCH 1/8] Resolved issue #444 --- ...nAssertAdobeStockImageSavedActionGroup.xml | 2 +- .../Test/Mftf/Data/AdobeStockConfigData.xml | 3 ++ .../Section/AdobeStockImagePreviewSection.xml | 4 +- .../Test/Mftf/Section/AdobeStockSection.xml | 2 +- ...AdobeStockSavedLicensedImageLocateTest.xml | 46 +++++++++++++++++++ .../components/grid/column/preview/actions.js | 9 ++++ .../template/grid/column/preview/actions.html | 6 ++- 7 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAssertAdobeStockImageSavedActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAssertAdobeStockImageSavedActionGroup.xml index fc84c4050d2b..8d09e61d06ad 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAssertAdobeStockImageSavedActionGroup.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAssertAdobeStockImageSavedActionGroup.xml @@ -12,6 +12,6 @@ - + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml index 9ad44c2817db..a38e8c200a55 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml @@ -29,4 +29,7 @@ {{_CREDS.magento/ADOBE_STOCK_USER_PASSWORD}} + + {{_ENV.ADOBE_STOCK_SAVED_AND_LICENSED_IMAGE_1}} + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml index ec11ee6ef332..e80b7b7aabe5 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml @@ -8,7 +8,9 @@
- + + + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml index f605df73c500..83681f7db29a 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml @@ -21,7 +21,7 @@ - + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml new file mode 100644 index 000000000000..f1ec13242d5e --- /dev/null +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml @@ -0,0 +1,46 @@ + + + + + + + + + + <description value="User can locate previously saved and licensed image in Media Gallery"/> + <severity value="CRITICAL"/> + <group value="adobe_stock_integration_license"/> + <group value="adobe_stock_integration"/> + </annotations> + <before> + <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + <actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/> + <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/> + <actionGroup ref="AdminAdobeStockClickSignInActionGroup" stepKey="clickOnSignIn"/> + <actionGroup ref="AdminAdobeStockImsPopupSignInFillUserDataActionGroup" stepKey="fillUserCredentials"/> + <actionGroup ref="AdminAdobeStockImsPopupClickSignInActionGroup" stepKey="clickSignInImsPopup"/> + <actionGroup ref="AdminAdobeStockAssertUserLoggedActionGroup" stepKey="assertUserLoggedIn"/> + </before> + <after> + <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/> + <actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/> + <actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertUserLoggedOut"/> + <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/> + <actionGroup ref="logout" stepKey="adminLogout"/> + </after> + <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage"> + <argument name="query" value="{{AdobeStockConfigDataSavedLicensedImage1.value}}"/> + </actionGroup> + <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> + <grabAttributeFrom userInput="name" selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="grabImageFileName"/> + <click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/> + <waitForPageLoad stepKey="waitForMediaGalleryOpen" /> + <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage" /> + </test> +</tests> diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js index b7dc2f80934f..0516d32aa4a6 100644 --- a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js +++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js @@ -413,6 +413,15 @@ define([ */ getLicenseButtonTitle: function () { return this.isDownloaded() ? $.mage.__('License') : $.mage.__('License and Save'); + }, + + /** + * Returns image name of previously saved preview image + * + * @returns {String} + */ + getImageName: function () { + return this.preview().displayedRecord()['path'].split('/').pop(); } }); }); diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html b/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html index 466f475401d3..218391087d6f 100644 --- a/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html +++ b/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html @@ -18,8 +18,10 @@ <button class="action-secondary" type="button" data-bind="visible: !isDownloaded() && !isLicensed(), click: function(){ savePreview() }"> <span translate="'Save Preview'"/> </button> -<button class="action-secondary" type="button" data-bind="visible: isDownloaded(), click: function(){ locate() }"> - <span translate="'Locate'"/> +<button class="action-secondary" + type="button" + data-bind="visible: isDownloaded(), click: function(){ locate() }"> + <span attr="name: getImageName()" translate="'Locate'"/> </button> <button class="action-default primary" type="button" From 93e5c339bd9758b238db23ead48111ca179e333e Mon Sep 17 00:00:00 2001 From: Adarsh Manickam <amanickam@ztech.io> Date: Wed, 6 Nov 2019 00:06:29 +0530 Subject: [PATCH 2/8] Issue-444 bug fix and code refactor --- .../Test/Mftf/Data/AdobeStockConfigData.xml | 4 ++-- .../Test/Mftf/Section/AdobeStockImagePreviewSection.xml | 2 +- .../Test/AdminAdobeStockSavedLicensedImageLocateTest.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml index a38e8c200a55..39d27e6b50fc 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml @@ -29,7 +29,7 @@ <entity name="AdobeStockConfigDataSignInPasswordData"> <data key="value">{{_CREDS.magento/ADOBE_STOCK_USER_PASSWORD}}</data> </entity> - <entity name="AdobeStockConfigDataSavedLicensedImage1"> - <data key="value">{{_ENV.ADOBE_STOCK_SAVED_AND_LICENSED_IMAGE_1}}</data> + <entity name="AdobeStockConfigDataPreviewedLicensedSavedImage"> + <data key="value">{{_ENV.ADOBE_STOCK_PREVIEWED_LICENSED_SAVED_IMAGE}}</data> </entity> </entities> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml index e80b7b7aabe5..24f85d7dc5a7 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml @@ -9,7 +9,7 @@ <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="AdobeStockImagePreviewSection"> <element name="save" type="block" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/> - <element name="locateImage" type="block" selector="//button[@class='action-secondary']//span[text()='Locate')]"/> + <element name="locateImage" type="button" selector="//button[@class='action-secondary']//span[text()='Locate']"/> <element name="saveLicensedImage" type="block" selector="//button[@class='action-default primary']//span[text()='Save']"/> <element name="image" type="block" selector="//div[@class='masonry-image-preview']//img"/> <element name="navigation" type="button" selector="//div[@class='masonry-image-preview']//div[contains(@class, 'action-buttons')]/button[@class='action-{{type}}']" parameterized="true"/> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml index f1ec13242d5e..79020da49b11 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml @@ -30,15 +30,15 @@ <after> <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/> <actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/> - <actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertUserLoggedOut"/> + <actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/> <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/> <actionGroup ref="logout" stepKey="adminLogout"/> </after> <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage"> - <argument name="query" value="{{AdobeStockConfigDataSavedLicensedImage1.value}}"/> + <argument name="query" value="{{AdobeStockConfigDataPreviewedLicensedSavedImage.value}}"/> </actionGroup> <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> - <grabAttributeFrom userInput="name" selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="grabImageFileName"/> + <grabAttributeFrom selector="{{AdobeStockImagePreviewSection.locateImage}}" userInput="name" stepKey="grabImageFileName"/> <click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/> <waitForPageLoad stepKey="waitForMediaGalleryOpen" /> <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage" /> From 2b51b93f8a6be563c8c4b637e52f0bc059faacd8 Mon Sep 17 00:00:00 2001 From: Adarsh Manickam <amanickam@ztech.io> Date: Wed, 6 Nov 2019 14:35:23 +0530 Subject: [PATCH 3/8] Made after node stateless --- .../Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml index 79020da49b11..0c5e6f219e2f 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml @@ -28,6 +28,7 @@ <actionGroup ref="AdminAdobeStockAssertUserLoggedActionGroup" stepKey="assertUserLoggedIn"/> </before> <after> + <actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/> <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/> <actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/> <actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/> From cd7a897c3bb65fba48ea10842bcf9093cb3817aa Mon Sep 17 00:00:00 2001 From: Adarsh Manickam <amanickam@ztech.io> Date: Fri, 8 Nov 2019 14:40:35 +0530 Subject: [PATCH 4/8] Made MFTF test stateless --- ...dminMediaGalleryDeleteImageActionGroup.xml | 23 +++++++++++++++++++ .../Test/Mftf/Section/AdobeStockSection.xml | 1 + ...AdobeStockSavedLicensedImageLocateTest.xml | 18 +++++++++++++-- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml new file mode 100644 index 000000000000..09b1673c54af --- /dev/null +++ b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminMediaGalleryDeleteImage"> + <arguments> + <argument name="generatedImageName" type="string"/> + </arguments> + <seeElement selector="{{AdobeStockSection.mediaGalleryImage({{generatedImageName}})}}" stepKey="seeImageToDelete"/> + <click selector="{{AdobeStockSection.mediaGalleryImage({{generatedImageName}})}}" stepKey="clickImageToDelete"/> + <waitForElementVisible selector="{{AdobeStockSection.mediaGalleryDeleteButton}}" stepKey="waitForDeleteButton"/> + <click selector="{{AdobeStockSection.mediaGalleryDeleteButton}}" stepKey="clickDeleteButton"/> + <waitForElementVisible selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/> + <click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickConfirmButton"/> + <waitForPageLoad stepKey="waitForMaskDisappeared"/> + <dontSeeElement selector="{{AdobeStockSection.mediaGalleryImage({$generatedImageName})}}" stepKey="verifyImageIsDeleted"/> + </actionGroup> +</actionGroups> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml index 83681f7db29a..9576e7acf59c 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml @@ -22,6 +22,7 @@ <element name="countGridImages" type="text" selector="//div[@class='masonry-image-grid']/div[contains(.,data-repeat-index)]"/> <element name="recordsFound" type="text" selector="//*[@id='adobe-stock-images-search-modal']//*[text()='records found']/parent::div"/> <element name="mediaGalleryImage" type="button" selector="//img[contains(@alt,'{{imageName}}')]" parameterized="true"/> + <element name="mediaGalleryDeleteButton" type="button" selector="#delete_files"/> <element name="systemAclActions" type="checkbox" selector="//a[text()='Adobe Stock']/parent::li[contains(.,'Actions')]//a"/> <element name="adobeSignIn" type="button" selector=".adobe-sign-in-button"/> <element name="adobeImsPopupUserEmail" type="button" selector="#adobeid_username"/> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml index 0c5e6f219e2f..d07027fcd1ab 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml @@ -26,9 +26,23 @@ <actionGroup ref="AdminAdobeStockImsPopupSignInFillUserDataActionGroup" stepKey="fillUserCredentials"/> <actionGroup ref="AdminAdobeStockImsPopupClickSignInActionGroup" stepKey="clickSignInImsPopup"/> <actionGroup ref="AdminAdobeStockAssertUserLoggedActionGroup" stepKey="assertUserLoggedIn"/> + <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage"> + <argument name="query" value="{{AdobeStockConfigDataPreviewedLicensedSavedImage.value}}"/> + </actionGroup> + <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> + <click selector="{{AdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/> + <waitForPageLoad stepKey="waitForPromptModal"/> + <grabValueFrom selector="{{AdobeStockImagePreviewSection.generatedImageName}}" stepKey="grabSaveImageFileName"/> + <click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/> + <waitForPageLoad stepKey="waitForMediaGalleryOpen"/> + <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="assertSavedImage"/> + <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/> </before> <after> <actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/> + <actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup"> + <argument name="generatedImageName" value="{$grabImageFileName}"/> + </actionGroup> <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/> <actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/> <actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/> @@ -41,7 +55,7 @@ <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> <grabAttributeFrom selector="{{AdobeStockImagePreviewSection.locateImage}}" userInput="name" stepKey="grabImageFileName"/> <click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/> - <waitForPageLoad stepKey="waitForMediaGalleryOpen" /> - <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage" /> + <waitForPageLoad stepKey="waitForMediaGalleryOpen"/> + <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/> </test> </tests> From 3e95f86bb4bbd470d89951ea0111426cfd6fce19 Mon Sep 17 00:00:00 2001 From: Adarsh Manickam <amanickam@ztech.io> Date: Mon, 4 Nov 2019 16:36:08 +0530 Subject: [PATCH 5/8] Resolved issue #444 --- .../Test/Mftf/Data/AdobeStockConfigData.xml | 3 +++ .../Test/Mftf/Section/AdobeStockImagePreviewSection.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml index 39d27e6b50fc..45dd4b834d5d 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml @@ -32,4 +32,7 @@ <entity name="AdobeStockConfigDataPreviewedLicensedSavedImage"> <data key="value">{{_ENV.ADOBE_STOCK_PREVIEWED_LICENSED_SAVED_IMAGE}}</data> </entity> + <entity name="AdobeStockConfigDataSavedLicensedImage1"> + <data key="value">{{_ENV.ADOBE_STOCK_SAVED_AND_LICENSED_IMAGE_1}}</data> + </entity> </entities> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml index 24f85d7dc5a7..48785250e301 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml @@ -8,9 +8,9 @@ <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="AdobeStockImagePreviewSection"> - <element name="save" type="block" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/> + <element name="save" type="button" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/> <element name="locateImage" type="button" selector="//button[@class='action-secondary']//span[text()='Locate']"/> - <element name="saveLicensedImage" type="block" selector="//button[@class='action-default primary']//span[text()='Save']"/> + <element name="saveLicensedImage" type="button" selector="//button[@class='action-default primary']//span[text()='Save']"/> <element name="image" type="block" selector="//div[@class='masonry-image-preview']//img"/> <element name="navigation" type="button" selector="//div[@class='masonry-image-preview']//div[contains(@class, 'action-buttons')]/button[@class='action-{{type}}']" parameterized="true"/> <element name="attribute" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@data-role='image-attributes-value']//span[text()='{{type}}']/parent::div//div[@class='value']//span" parameterized="true"/> From 454a1469b413382a49da0139bb7cf3a49cbcc193 Mon Sep 17 00:00:00 2001 From: Adarsh Manickam <amanickam@ztech.io> Date: Wed, 6 Nov 2019 00:06:29 +0530 Subject: [PATCH 6/8] Issue-444 bug fix and code refactor --- .../Test/Mftf/Data/AdobeStockConfigData.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml index 45dd4b834d5d..386a377c9c89 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml @@ -32,7 +32,7 @@ <entity name="AdobeStockConfigDataPreviewedLicensedSavedImage"> <data key="value">{{_ENV.ADOBE_STOCK_PREVIEWED_LICENSED_SAVED_IMAGE}}</data> </entity> - <entity name="AdobeStockConfigDataSavedLicensedImage1"> - <data key="value">{{_ENV.ADOBE_STOCK_SAVED_AND_LICENSED_IMAGE_1}}</data> + <entity name="AdobeStockConfigDataPreviewedLicensedSavedImage"> + <data key="value">{{_ENV.ADOBE_STOCK_PREVIEWED_LICENSED_SAVED_IMAGE}}</data> </entity> </entities> From cb29fc6d6e2273bacbc27377b3ab83508f3416da Mon Sep 17 00:00:00 2001 From: Adarsh Manickam <amanickam@ztech.io> Date: Fri, 15 Nov 2019 14:41:09 +0530 Subject: [PATCH 7/8] Fixed incorrect selector --- .../AdminMediaGalleryDeleteImageActionGroup.xml | 12 +++++++++--- .../Test/Mftf/Data/AdobeStockConfigData.xml | 7 ++----- .../Mftf/Section/AdobeStockImagePreviewSection.xml | 2 +- ...AdminAdobeStockSavedLicensedImageLocateTest.xml | 14 +++++++------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml index 09b1673c54af..5cc9e2998eb1 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminMediaGalleryDeleteImageActionGroup.xml @@ -11,13 +11,19 @@ <arguments> <argument name="generatedImageName" type="string"/> </arguments> - <seeElement selector="{{AdobeStockSection.mediaGalleryImage({{generatedImageName}})}}" stepKey="seeImageToDelete"/> - <click selector="{{AdobeStockSection.mediaGalleryImage({{generatedImageName}})}}" stepKey="clickImageToDelete"/> + <seeElement selector="{{AdobeStockSection.mediaGalleryImage(generatedImageName)}}" stepKey="seeImageToDelete"/> + <click selector="{{AdobeStockSection.mediaGalleryImage(generatedImageName)}}" stepKey="clickImageToDelete"/> + <!-- Click image again, incase image was already selected and above step unselected the image by clicking it --> + <conditionalClick + visible="false" + dependentSelector="{{AdobeStockSection.mediaGalleryDeleteButton}}" + selector="{{AdobeStockSection.mediaGalleryImage(generatedImageName)}}" + stepKey="clickImageToDeleteAgain"/> <waitForElementVisible selector="{{AdobeStockSection.mediaGalleryDeleteButton}}" stepKey="waitForDeleteButton"/> <click selector="{{AdobeStockSection.mediaGalleryDeleteButton}}" stepKey="clickDeleteButton"/> <waitForElementVisible selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="waitForConfirmationModal"/> <click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickConfirmButton"/> <waitForPageLoad stepKey="waitForMaskDisappeared"/> - <dontSeeElement selector="{{AdobeStockSection.mediaGalleryImage({$generatedImageName})}}" stepKey="verifyImageIsDeleted"/> + <dontSeeElement selector="{{AdobeStockSection.mediaGalleryImage(generatedImageName)}}" stepKey="assertImageIsDeleted"/> </actionGroup> </actionGroups> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml index 386a377c9c89..e036e7df40e9 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml @@ -29,10 +29,7 @@ <entity name="AdobeStockConfigDataSignInPasswordData"> <data key="value">{{_CREDS.magento/ADOBE_STOCK_USER_PASSWORD}}</data> </entity> - <entity name="AdobeStockConfigDataPreviewedLicensedSavedImage"> - <data key="value">{{_ENV.ADOBE_STOCK_PREVIEWED_LICENSED_SAVED_IMAGE}}</data> - </entity> - <entity name="AdobeStockConfigDataPreviewedLicensedSavedImage"> - <data key="value">{{_ENV.ADOBE_STOCK_PREVIEWED_LICENSED_SAVED_IMAGE}}</data> + <entity name="AdobeStockConfigDataLicensedImage"> + <data key="value">{{_CREDS.magento/ADOBE_STOCK_LICENSED_IMAGE}}</data> </entity> </entities> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml index 48785250e301..4b2f94308dbc 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml @@ -10,7 +10,7 @@ <section name="AdobeStockImagePreviewSection"> <element name="save" type="button" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/> <element name="locateImage" type="button" selector="//button[@class='action-secondary']//span[text()='Locate']"/> - <element name="saveLicensedImage" type="button" selector="//button[@class='action-default primary']//span[text()='Save']"/> + <element name="saveLicensedImage" type="button" selector="//div[@class='actions']/descendant::span[text()='Save']"/> <element name="image" type="block" selector="//div[@class='masonry-image-preview']//img"/> <element name="navigation" type="button" selector="//div[@class='masonry-image-preview']//div[contains(@class, 'action-buttons')]/button[@class='action-{{type}}']" parameterized="true"/> <element name="attribute" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@data-role='image-attributes-value']//span[text()='{{type}}']/parent::div//div[@class='value']//span" parameterized="true"/> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml index d07027fcd1ab..4790a538eb7f 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml @@ -11,9 +11,9 @@ <test name="AdminAdobeStockSavedLicensedImageLocateTest"> <annotations> <features value="AdobeStockImagePanel"/> - <stories value="User locates saved and licensed image inside Media Gallery"/> + <stories value="User locates licensed and uploaded image inside Media Gallery"/> <title value="Adobe Stock Saved Licensed Image Locate"/> - <description value="User can locate previously saved and licensed image in Media Gallery"/> + <description value="User can locate previously licensed and saved image in Media Gallery"/> <severity value="CRITICAL"/> <group value="adobe_stock_integration_license"/> <group value="adobe_stock_integration"/> @@ -27,7 +27,7 @@ <actionGroup ref="AdminAdobeStockImsPopupClickSignInActionGroup" stepKey="clickSignInImsPopup"/> <actionGroup ref="AdminAdobeStockAssertUserLoggedActionGroup" stepKey="assertUserLoggedIn"/> <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage"> - <argument name="query" value="{{AdobeStockConfigDataPreviewedLicensedSavedImage.value}}"/> + <argument name="query" value="{{AdobeStockConfigDataLicensedImage.value}}"/> </actionGroup> <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> <click selector="{{AdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/> @@ -40,9 +40,6 @@ </before> <after> <actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/> - <actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup"> - <argument name="generatedImageName" value="{$grabImageFileName}"/> - </actionGroup> <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/> <actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/> <actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/> @@ -50,12 +47,15 @@ <actionGroup ref="logout" stepKey="adminLogout"/> </after> <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage"> - <argument name="query" value="{{AdobeStockConfigDataPreviewedLicensedSavedImage.value}}"/> + <argument name="query" value="{{AdobeStockConfigDataLicensedImage.value}}"/> </actionGroup> <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> <grabAttributeFrom selector="{{AdobeStockImagePreviewSection.locateImage}}" userInput="name" stepKey="grabImageFileName"/> <click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/> <waitForPageLoad stepKey="waitForMediaGalleryOpen"/> <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/> + <actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup"> + <argument name="generatedImageName" value="{$grabImageFileName}"/> + </actionGroup> </test> </tests> From 2e87de26fcb9c3e1b3329336055676d6507b3735 Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko <serg.ivashchenko@gmail.com> Date: Wed, 20 Nov 2019 21:30:40 +0000 Subject: [PATCH 8/8] magento/adobe-stock-integration#639: Fixed locate selector, reverted js-html changes, refactored the test --- ...dobeStockImagePreviewLocateActionGroup.xml | 15 ++++++++++++ .../Section/AdobeStockImagePreviewSection.xml | 2 +- ...AdobeStockSavedLicensedImageLocateTest.xml | 24 +++++++------------ .../components/grid/column/preview/actions.js | 9 ------- .../template/grid/column/preview/actions.html | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockImagePreviewLocateActionGroup.xml diff --git a/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockImagePreviewLocateActionGroup.xml b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockImagePreviewLocateActionGroup.xml new file mode 100644 index 000000000000..37fd0eaabde2 --- /dev/null +++ b/AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockImagePreviewLocateActionGroup.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminAdobeStockImagePreviewLocateActionGroup"> + <click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/> + <waitForPageLoad stepKey="waitForMediaGalleryOpen"/> + </actionGroup> +</actionGroups> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml index ae4ac5a0f4d3..a6bb8805d29a 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml @@ -11,7 +11,7 @@ <element name="savePreview" type="button" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/> <element name="licenseAndSave" type="button" selector="//button[@class='action-default primary']//span[text()='License and Save']"/> <element name="save" type="block" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/> - <element name="locateImage" type="block" selector="//button[@class='action-secondary']//span[text()='Locate')]"/> + <element name="locateImage" type="block" selector="//button[@class='action-secondary']//span[text()='Locate']"/> <element name="saveLicensedImage" type="button" selector="//div[@class='actions']/descendant::span[text()='Save']"/> <element name="image" type="block" selector="//div[@class='masonry-image-preview']//img"/> <element name="navigation" type="button" selector="//div[@class='masonry-image-preview']//div[contains(@class, 'action-buttons')]/button[@class='action-{{type}}']" parameterized="true"/> diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml index 1a063aa7e13c..5c9a41b48cfa 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml @@ -26,17 +26,6 @@ <actionGroup ref="AdminAdobeStockImsPopupSignInFillUserDataActionGroup" stepKey="fillUserCredentials"/> <actionGroup ref="AdminAdobeStockImsPopupClickSignInActionGroup" stepKey="clickSignInImsPopup"/> <actionGroup ref="AdminAdobeStockAssertUserLoggedActionGroup" stepKey="assertUserLoggedIn"/> - <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage"> - <argument name="query" value="{{AdobeStockLicensedImage.id}}"/> - </actionGroup> - <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> - <click selector="{{AdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/> - <waitForPageLoad stepKey="waitForPromptModal"/> - <grabValueFrom selector="{{AdobeStockImagePreviewSection.generatedImageName}}" stepKey="grabSaveImageFileName"/> - <click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/> - <waitForPageLoad stepKey="waitForMediaGalleryOpen"/> - <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="assertSavedImage"/> - <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/> </before> <after> <actionGroup ref="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/> @@ -50,12 +39,17 @@ <argument name="query" value="{{AdobeStockLicensedImage.id}}"/> </actionGroup> <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/> - <grabAttributeFrom selector="{{AdobeStockImagePreviewSection.locateImage}}" userInput="name" stepKey="grabImageFileName"/> - <click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/> + <click selector="{{AdobeStockImagePreviewSection.saveLicensedImage}}" stepKey="clickSave"/> + <waitForPageLoad stepKey="waitForPromptModal"/> + <grabValueFrom selector="{{AdobeStockImagePreviewSection.imageNameField}}" stepKey="grabSaveImageFileName"/> + <click selector="{{AdobeStockImagePreviewSection.confirm}}" stepKey="clickOnPopupConfirm"/> <waitForPageLoad stepKey="waitForMediaGalleryOpen"/> - <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage"/> + <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="imageSaved"/> + <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanelAgain"/> + <actionGroup ref="AdminAdobeStockImagePreviewLocateActionGroup" stepKey="locateImage"/> + <seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabSaveImageFileName})}}" stepKey="imageLocated"/> <actionGroup ref="AdminMediaGalleryDeleteImage" stepKey="deleteImageActionGroup"> - <argument name="name" value="{$grabImageFileName}"/> + <argument name="name" value="{$grabSaveImageFileName}"/> </actionGroup> </test> </tests> diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js index 02179d748c9c..986fca0d8b15 100644 --- a/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js +++ b/AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js @@ -416,15 +416,6 @@ define([ */ getLicenseButtonTitle: function () { return this.isDownloaded() ? $.mage.__('License') : $.mage.__('License and Save'); - }, - - /** - * Returns image name of previously saved preview image - * - * @returns {String} - */ - getImageName: function () { - return this.preview().displayedRecord()['path'].split('/').pop(); } }); }); diff --git a/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html b/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html index 0315fc732fcd..66a1ecd365cc 100644 --- a/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html +++ b/AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html @@ -21,7 +21,7 @@ <button class="action-secondary" type="button" data-bind="visible: isDownloaded(), click: function(){ locate() }"> - <span attr="name: getImageName()" translate="'Locate'"/> + <span translate="'Locate'"/> </button> <button class="action-default primary" type="button"