Merge pull request #714 from drpayyne/issue-440

Added MFTF test to verify License and Save button is visible

Author: sivaschenko

.travis.yml

@@ -28,6 +28,7 @@ env:
     - MAGENTO_ADMIN_USERNAME="admin"
     - MAGENTO_ADMIN_PASSWORD="123123q"
     - ADOBE_STOCK_LICENSED_IMAGE="175947395"
+    - ADOBE_STOCK_UNLICENSED_IMAGE="24860368"
   matrix:
     - TEST_SUITE=unit
     - TEST_SUITE=phpstan

AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml

@@ -14,4 +14,7 @@
     <entity name="AdobeStockLicensedImage">
         <data key="id">{{_ENV.ADOBE_STOCK_LICENSED_IMAGE}}</data>
     </entity>
+    <entity name="AdobeStockUnlicensedImage">
+        <data key="id">{{_ENV.ADOBE_STOCK_UNLICENSED_IMAGE}}</data>
+    </entity>
 </entities>

AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml

@@ -8,6 +8,8 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdobeStockImagePreviewSection">
+        <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="saveLicensedImage" type="button" selector="//div[@class='actions']/descendant::span[text()='Save']"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockNotLicensedImageLicenseTest.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAdobeStockNotLicensedImageLicenseTest">
+        <annotations>
+            <features value="AdobeStockImagePanel"/>
+            <stories value="User licenses an image"/>
+            <title value="Adobe Stock License Image"/>
+            <description value="User can license Adobe Stock image"/>
+            <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="AdminOpenMediaGalleryForPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+            <actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
+            <actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/>
+            <actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/>
+            <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+        </after>
+        <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
+            <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandPreviewedImage"/>
+        <seeElement selector="{{AdobeStockImagePreviewSection.licenseAndSave}}" stepKey="assertLicenseAndSaveButtonIsVisible"/>
+    </test>
+</tests>

dev/tests/acceptance/.env

@@ -4,3 +4,4 @@ MAGENTO_ADMIN_USERNAME=%MAGENTO_ADMIN_USERNAME%
 MAGENTO_ADMIN_PASSWORD=%MAGENTO_ADMIN_PASSWORD%
 BROWSER=chrome
 ADOBE_STOCK_LICENSED_IMAGE=%ADOBE_STOCK_LICENSED_IMAGE%
+ADOBE_STOCK_UNLICENSED_IMAGE=%ADOBE_STOCK_UNLICENSED_IMAGE%

dev/travis/before_script.sh

@@ -65,6 +65,7 @@ if [[ ${TEST_SUITE} = "functional" ]]; then
     sed -e "s?%MAGENTO_ADMIN_USERNAME%?${MAGENTO_ADMIN_USERNAME}?g" --in-place ./.env
     sed -e "s?%MAGENTO_ADMIN_PASSWORD%?${MAGENTO_ADMIN_PASSWORD}?g" --in-place ./.env
     sed -e "s?%ADOBE_STOCK_LICENSED_IMAGE%?${ADOBE_STOCK_LICENSED_IMAGE}?g" --in-place ./.env
+    sed -e "s?%ADOBE_STOCK_UNLICENSED_IMAGE%?${ADOBE_STOCK_UNLICENSED_IMAGE}?g" --in-place ./.env
     cp -f ${TRAVIS_BUILD_DIR}/dev/tests/acceptance/.credentials .credentials
     sed -e "s?%ADOBE_STOCK_API_KEY%?${ADOBE_STOCK_API_KEY}?g" --in-place ./.credentials
     sed -e "s?%ADOBE_STOCK_PRIVATE_KEY%?${ADOBE_STOCK_PRIVATE_KEY}?g" --in-place ./.credentials