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

[MFTF] Fix seeMore 1.0-develop #1176

Merged
merged 4 commits into from
Apr 14, 2020
Merged

[MFTF] Fix seeMore 1.0-develop #1176

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
9493ae0
fix seeMore 1.0-develop
engcom-Charlie Apr 9, 2020
d86cefc
test commit
engcom-Charlie Apr 9, 2020
05ca8cc
revert test change
engcom-Charlie Apr 9, 2020
de57e6f
change image data
engcom-Charlie Apr 9, 2020
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
4 changes: 2 additions & 2 deletions AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 4 additions & 3 deletions AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminAdobeStockImagePreviewSameSeriesSeeMoreTest">
<annotations>
<skip>
<issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
</skip>
<features value="AdobeStockImagePanel"/>
<stories value="[Story #31] User searches for images from the same series as the currently viewed one"/>
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/346"/>
Expand All @@ -31,7 +28,11 @@
<actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/>
<actionGroup ref="logout" stepKey="logout"/>
</after>

<grabTextFrom selector="{{AdobeStockSection.recordsFound}}" stepKey="countWithoutModelFilter"/>
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
<argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
</actionGroup>
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
<waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>
<executeJS function="document.querySelector('#adobe-stock-tabs').scrollIntoView()" stepKey="scrollToSeeMoreTabs"/>
Expand Down
6 changes: 3 additions & 3 deletions AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminAdobeStockImagePreviewSameSeriesTest">
<annotations>
<skip>
<issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
</skip>
<features value="AdobeStockImagePanel"/>
<stories value="[Story #29] User sees images from the same series as the currently viewed image"/>
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/324"/>
Expand All @@ -31,6 +28,9 @@
<actionGroup ref="logout" stepKey="logout"/>
</after>

<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
<argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
</actionGroup>
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
<waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>
<executeJS function="document.querySelector('#adobe-stock-tabs').scrollIntoView()" stepKey="scrollToSeeMoreTabs"/>
Expand Down
7 changes: 4 additions & 3 deletions AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminSeeMoreFromSeriesTest">
<annotations>
<skip>
<issueId value="https://github.com/magento/adobe-stock-integration/issues/1170"/>
</skip>
<features value="AdobeStockImagePanel"/>
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1006"/>
<title value="Cover User clicks See more button on Preview of the same image for the second time"/>
Expand All @@ -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"/>
Expand Down