Skip to content

Commit eb297ba

Browse files
committed
Issue-444 bug fix and code refactor
1 parent e889426 commit eb297ba

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockConfigData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<entity name="AdobeStockConfigDataSignInPasswordData">
3030
<data key="value">{{_ENV.ADOBE_STOCK_USER_PASSWORD}}</data>
3131
</entity>
32-
<entity name="AdobeStockConfigDataSavedLicensedImage1">
33-
<data key="value">{{_ENV.ADOBE_STOCK_SAVED_AND_LICENSED_IMAGE_1}}</data>
32+
<entity name="AdobeStockConfigDataPreviewedLicensedSavedImage">
33+
<data key="value">{{_ENV.ADOBE_STOCK_PREVIEWED_LICENSED_SAVED_IMAGE}}</data>
3434
</entity>
3535
</entities>

AdobeStockImageAdminUi/Test/Mftf/Section/AdobeStockImagePreviewSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdobeStockImagePreviewSection">
1111
<element name="save" type="block" selector="//button[@class='action-secondary']//span[text()='Save Preview']"/>
12-
<element name="locateImage" type="block" selector="//button[@class='action-secondary']//span[text()='Locate')]"/>
12+
<element name="locateImage" type="button" selector="//button[@class='action-secondary']//span[text()='Locate']"/>
1313
<element name="saveLicensedImage" type="block" selector="//button[@class='action-default primary']//span[text()='Save']"/>
1414
<element name="image" type="block" selector="//div[@class='masonry-image-preview']//img"/>
1515
<element name="navigation" type="block" selector="//div[@class='masonry-image-preview']//div[@class='action-buttons']/button[@class='action-{{type}}']" parameterized="true"/>

AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavedLicensedImageLocateTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
<after>
3131
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
3232
<actionGroup ref="AdminAdobeStockUserSignOutActionGroup" stepKey="adobeLogout"/>
33-
<actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertUserLoggedOut"/>
33+
<actionGroup ref="AdminAdobeStockAssertUserNotLoggedActionGroup" stepKey="assertAdobeUserLoggedOut"/>
3434
<actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetAdminDataGridToDefaultView"/>
3535
<actionGroup ref="logout" stepKey="adminLogout"/>
3636
</after>
3737
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForLicensedImage">
38-
<argument name="query" value="{{AdobeStockConfigDataSavedLicensedImage1.value}}"/>
38+
<argument name="query" value="{{AdobeStockConfigDataPreviewedLicensedSavedImage.value}}"/>
3939
</actionGroup>
4040
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandLicensedImage"/>
41-
<grabAttributeFrom userInput="name" selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="grabImageFileName"/>
41+
<grabAttributeFrom selector="{{AdobeStockImagePreviewSection.locateImage}}" userInput="name" stepKey="grabImageFileName"/>
4242
<click selector="{{AdobeStockImagePreviewSection.locateImage}}" stepKey="clickLocate"/>
4343
<waitForPageLoad stepKey="waitForMediaGalleryOpen" />
4444
<seeElement selector="{{AdobeStockSection.mediaGalleryImage({$grabImageFileName})}}" stepKey="assertSavedImage" />

AdobeStockImageAdminUi/view/adminhtml/web/template/grid/column/preview/actions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</button>
2121
<button class="action-secondary"
2222
type="button"
23-
data-bind="visible: isDownloaded() && !isLicensed(), click: function(){ locate() }">
23+
data-bind="visible: isDownloaded(), click: function(){ locate() }">
2424
<span attr="name: getImageName()" translate="'Locate'"/>
2525
</button>
2626
<button class="action-default primary"

0 commit comments

Comments
 (0)