Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved issue #453 #627

Merged
merged 4 commits into from
Nov 5, 2019
Merged

Resolved issue #453 #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
176e68b
Resolved issue #453
drpayyne Nov 2, 2019
5a13297
Moved view credits test to action group
drpayyne Nov 3, 2019
f39911d
Moved text data to data entity and refactored code
drpayyne Nov 4, 2019
24f7963
Merge branch 'develop' into issue-453
diazwatson Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AdobeIms/view/adminhtml/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
border: none;
margin-right: 3%;
z-index: 99;
position: initial;
position: relative;
box-shadow: none;
float: right;
margin-top: -50px;
Expand Down
17 changes: 17 additions & 0 deletions ...StockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockSignedInViewCreditsActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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="AdminAdobeStockSignedInViewCreditsActionGroup">
<click selector="{{AdobeStockSection.userNameButton}}" stepKey="openAccountMenu"/>
<see userInput="{{AdobeStockModalData.availableText}}" selector="{{AdobeStockSection.userQuota}}" stepKey="seeAvailableText"/>
<see userInput="{{AdobeStockModalData.creditsText}}" selector="{{AdobeStockSection.userQuota}}" stepKey="seeCreditsText"/>
<see userInput="{{AdobeStockModalData.imagesText}}" selector="{{AdobeStockSection.userQuota}}" stepKey="seeImagesText"/>
<click selector="{{AdobeStockSection.userNameButton}}" stepKey="closeAccountMenu"/>
</actionGroup>
</actionGroups>
3 changes: 3 additions & 0 deletions AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockModalData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@
<data key="title">Adobe Stock</data>
<data key="thumbnailsNumber">32</data>
<data key="authenticationErrorMessage">Failed to authenticate to Adobe Stock API. Please correct the API credentials</data>
<data key="availableText">AVAILABLE</data>
<data key="creditsText">Credits</data>
<data key="imagesText">Images</data>
</entity>
</entities>
1 change: 1 addition & 0 deletions AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<element name="adobeImsPopupUserSignIn" type="button" selector="#sign_in"/>
<element name="userImageSmall" type="text" selector=".adobe-profile-image-small"/>
<element name="userNameButton" type="button" selector=".adobe-user-name"/>
<element name="userQuota" type="block" selector=".adobe-stock-user-quota"/>
<element name="userSignOut" type="button" selector=".adobe-sign-out-button"/>
<element name="sortDropdown" type="button" selector="div[class='masonry-sorting'] select"/>
<element name="sortOption" type="button" selector="//div[@class='masonry-sorting'] //option[@value='{{sortOption}}']" parameterized="true"/>
Expand Down
38 changes: 38 additions & 0 deletions AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSignedInCreditsVisibleTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?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="AdminAdobeStockSignedInCreditsVisibleTest">
<annotations>
<features value="AdobeStockImagePanel"/>
<stories value="Admin user can view credits and images available when signed in to Adobe Stock"/>
<title value="Admin user can view credits and images available when signed in to Adobe Stock"/>
<description value="Admin user can view credits and images available when signed in to Adobe Stock"/>
<severity value="CRITICAL"/>
<group value="adobe_stock_integration_grid"/>
<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="AdminAdobeStockUserSignOutActionGroup" stepKey="LogOut"/>
<actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertUserNotLogged"/>
<actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/>
<actionGroup ref="logout" stepKey="logout"/>
</after>
<actionGroup ref="AdminAdobeStockSignedInViewCreditsActionGroup" stepKey="viewCreditsInfo"/>
</test>
</tests>