Skip to content

Commit 9852409

Browse files
committed
Stability control duties
1 parent f1b1508 commit 9852409

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCheckProductByIdOnProductGridActionGroup.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
</arguments>
1818

1919
<waitForElementClickable selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="waitForElementClickable" />
20+
<scrollTo selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="scrollToProductCheckbox" />
21+
<moveMouseOver selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="moveMouseOverProductCheckbox" />
2022
<checkOption selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="selectProduct"/>
23+
<waitForPageLoad stepKey="waitForBackgroundProcessesToFinish" />
2124
</actionGroup>
2225
</actionGroups>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickMassUpdateProductAttributesActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<annotations>
1313
<description>Clicks on 'Update attributes' from dropdown actions list on product grid page. Products should be selected via mass action before</description>
1414
</annotations>
15+
<waitForElementClickable selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="waitForDropdownClickable" />
1516
<click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
17+
<waitForElementClickable selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="waitForOptionClickable" />
1618
<click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
1719
<waitForPageLoad stepKey="waitForBulkUpdatePage"/>
1820
<seeInCurrentUrl url="{{ProductAttributesEditPage.url}}" stepKey="seeInUrl"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyChangePriceForConfigurableProductWithAssignedSimpleProductsTest.xml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
<severity value="MAJOR"/>
1616
<testCaseId value="AC-2031"/>
1717
<group value="Catalog"/>
18-
<group value="AllIndexerBySchedule" />
1918
</annotations>
2019

2120
<before>
2221
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2322
<comment userInput="BIC workaround" stepKey="updateAnIndexerBySchedule"/>
2423
<comment userInput="BIC workaround" stepKey="enableFlatRate"/>
25-
<comment userInput="BIC workaround" stepKey="performReindex"/>
26-
<comment userInput="BIC workaround" stepKey="cleanCache"/>
2724

2825
<!-- Create category for configurable product -->
2926
<createData entity="SimpleSubCategory" stepKey="firstSimpleCategory"/>
@@ -60,6 +57,14 @@
6057
<requiredEntity createDataKey="createFirstConfigProduct"/>
6158
<requiredEntity createDataKey="createFirstConfigFirstChildProduct"/>
6259
</createData>
60+
61+
<!-- Reindex -->
62+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
63+
<argument name="indices" value=""/>
64+
</actionGroup>
65+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
66+
<argument name="tags" value="full_page"/>
67+
</actionGroup>
6368
</before>
6469

6570
<after>
@@ -89,14 +94,6 @@
8994
<comment userInput="BIC workaround" stepKey="createFirstConfigProductOption"/>
9095
<comment userInput="BIC workaround" stepKey="createFirstConfigProductAddFirstChild"/>
9196

92-
<!-- Reindex -->
93-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
94-
<argument name="indices" value=""/>
95-
</actionGroup>
96-
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
97-
<argument name="tags" value="full_page"/>
98-
</actionGroup>
99-
10097
<!-- Assert first product in category -->
10198
<actionGroup ref="StorefrontNavigateToCategoryUrlActionGroup" stepKey="goToFirstCategoryPageStorefront">
10299
<argument name="categoryUrl" value="$firstSimpleCategory.custom_attributes[url_key]$"/>
@@ -122,6 +119,7 @@
122119

123120
<!-- Assert first product in category -->
124121
<comment userInput="BIC workaround" stepKey="runCron1"/>
122+
<comment userInput="BIC workaround" stepKey="runCron2"/>
125123
<comment userInput="BIC workaround" stepKey="waitForUpdateStarts"/>
126124
<actionGroup ref="StorefrontNavigateToCategoryUrlActionGroup" stepKey="goToFirstCategoryPageStorefront1">
127125
<argument name="categoryUrl" value="$firstSimpleCategory.custom_attributes[url_key]$"/>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<argument name="customerAddressVar"/>
1919
</arguments>
2020

21+
<waitForElementVisible selector="{{CheckoutShippingSection.emailAddress}}" stepKey="waitForEmailField" />
2122
<fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customerVar.email}}" stepKey="enterEmail"/>
2223
<waitForPageLoad stepKey="waitForLoading3"/>
2324
<fillField selector="{{CheckoutPaymentSection.guestFirstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserViaCurlActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<actionGroup name="AdminDeleteUserViaCurlActionGroup">
1111
<arguments>
1212
<argument name="user" type="entity" />
13+
<argument name="adminPassword" type="string" defaultValue="{{DefaultAdminUser.password}}" />
1314
</arguments>
1415
<amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
1516
<waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
@@ -21,7 +22,7 @@
2122

2223
<createData entity="deleteUser" stepKey="deleteUser">
2324
<field key="user_id">{$userId}</field>
24-
<field key="current_password">{{DefaultAdminUser.password}}</field>
25+
<field key="current_password">{{adminPassword}}</field>
2526
</createData>
2627
</actionGroup>
2728
</actionGroups>

0 commit comments

Comments
 (0)