Skip to content

Commit d98a801

Browse files
okolesnykokolesnyk
committed
ACQE-5377: [Stabilithon] Review and deliver submitted Pull Requests
1 parent dbac9f9 commit d98a801

13 files changed

+44
-21
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</annotations>
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
22-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
22+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2323
<argument name="enabled" value="0"/>
2424
</actionGroup>
2525
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
@@ -40,7 +40,7 @@
4040
<argument name="categoryEntity" value="SimpleSubCategory"/>
4141
</actionGroup>
4242
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
43-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
43+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4444
<argument name="enabled" value="1"/>
4545
</actionGroup>
4646
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
23+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2424
<argument name="enabled" value="0"/>
2525
</actionGroup>
2626
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
@@ -39,7 +39,7 @@
3939
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
4040
<argument name="Image" value="{{ImageFolder.name}}"/>
4141
</actionGroup>
42-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
42+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4343
<argument name="enabled" value="1"/>
4444
</actionGroup>
4545
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminLimitNumberOfProductsInGridTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@
2020
</annotations>
2121

2222
<before>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
<!-- Delete all products left by prev tests because it sensitive for search-->
25+
<actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProducts"/>
26+
2327
<magentoCLI stepKey="enableLimitNumberOfProductsInGrid" command="config:set admin/grid/limit_total_number_of_products 1"/>
2428
<magentoCLI stepKey="setCustomRecordsLimit" command="config:set admin/grid/records_limit 2"/>
2529
<createData entity="SimpleProduct" stepKey="createSimpleProduct1"/>
26-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2730
</before>
2831

2932
<after>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductAttributeUpdateAddedToQueueTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@
4848
<checkOption selector="{{AdminEditProductAttributesSection.changeAttributeShortDescriptionToggle}}" stepKey="toggleToChangeShortDescription"/>
4949
<fillField selector="{{AdminEditProductAttributesSection.attributeShortDescription}}" userInput="Test Update" stepKey="fillShortDescriptionField"/>
5050
<actionGroup ref="AdminSaveProductsMassAttributesUpdateActionGroup" stepKey="saveMassAttributeUpdate"/>
51+
<waitForElementVisible selector="{{AdminSystemMessagesSection.info}}" stepKey="waitForInfoMessage" />
5152
<see selector="{{AdminSystemMessagesSection.info}}" userInput="Task &quot;Update attributes for 3 selected products&quot;: 1 item(s) have been scheduled for update." stepKey="seeInfoMessage"/>
5253
<click selector="{{AdminSystemMessagesSection.viewDetailsLink}}" stepKey="seeDetails"/>
54+
<waitForElementVisible selector="{{AdminBulkDetailsModalSection.descriptionValue}}" stepKey="waitForDescription" />
5355
<see selector="{{AdminBulkDetailsModalSection.descriptionValue}}" userInput="Update attributes for 3 selected products" stepKey="seeDescription"/>
5456
<see selector="{{AdminBulkDetailsModalSection.summaryValue}}" userInput="Pending, in queue..." stepKey="seeSummary"/>
5557
<grabTextFrom selector="{{AdminBulkDetailsModalSection.startTimeValue}}" stepKey="grabStartTimeValue"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
24-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
24+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2525
<argument name="enabled" value="0"/>
2626
</actionGroup>
2727
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
@@ -45,7 +45,7 @@
4545
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
4646
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
4747
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
48-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
48+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4949
<argument name="enabled" value="1"/>
5050
</actionGroup>
5151
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<before>
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
23+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2424
<argument name="enabled" value="0"/>
2525
</actionGroup>
2626
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
@@ -40,7 +40,7 @@
4040
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYGFirst"/>
4141
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
4242
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
43-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
43+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4444
<argument name="enabled" value="1"/>
4545
</actionGroup>
4646
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddLargeImageToWYSIWYGCMSTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<before>
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
23+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2424
<argument name="enabled" value="0"/>
2525
</actionGroup>
2626
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
@@ -29,7 +29,7 @@
2929
<after>
3030
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" />
3131
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
32-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
32+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
3333
<argument name="enabled" value="1"/>
3434
</actionGroup>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<before>
2323
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
25-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
25+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2626
<argument name="enabled" value="0"/>
2727
</actionGroup>
2828
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
@@ -31,7 +31,7 @@
3131
<after>
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
3333
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
34-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
34+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
3535
<argument name="enabled" value="1"/>
3636
</actionGroup>
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminMediaGalleryPopupUploadImagesWithoutErrorTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<comment userInput="Create block" stepKey="commentCreateBlock"/>
2828
<createData entity="Sales25offBlock" stepKey="createBlock"/>
2929
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
30-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
30+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
3131
<argument name="enabled" value="0"/>
3232
</actionGroup>
3333
</before>
@@ -47,7 +47,7 @@
4747
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
4848
<argument name="ImageFolder" value="ImageFolder"/>
4949
</actionGroup>
50-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
50+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
5151
<argument name="enabled" value="1"/>
5252
</actionGroup>
5353
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/CliMediaGalleryEnhancedEnableActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CliMediaGalleryEnhancedEnableActionGroup">
12+
<arguments>
13+
<argument name="enabled" type="string" defaultValue="{{MediaGalleryConfigDataDisabled.value}}"/>
14+
</arguments>
15+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{enabled}}" stepKey="oldMediaGalleryCliToggle"/>
16+
<magentoCLI command="cache:clean" arguments="config" stepKey="cleanConfigCache"/>
17+
</actionGroup>
18+
</actionGroups>

0 commit comments

Comments
 (0)