Skip to content

Commit deb760e

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'mainline/2.4-develop' into MC-32014-poc
2 parents 7d0579d + 3008324 commit deb760e

File tree

56 files changed

+1379
-418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1379
-418
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<!--Delete all created data during the test execution and assign Default Root Category to Store-->
2222
<after>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin2"/>
24-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
25-
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
24+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnPageAdminSystemStore"/>
2625
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
2726
<waitForPageLoad time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
2827
<fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store" stepKey="fillFieldOnWebsiteStore"/>
@@ -58,8 +57,7 @@
5857
<argument name="categoryEntity" value="SubCategoryWithParent"/>
5958
</actionGroup>
6059
<!--Assign new created root category to store-->
61-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
62-
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
60+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnPageAdminSystemStore"/>
6361
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
6462
<waitForPageLoad time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
6563
<fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store" stepKey="fillFieldOnWebsiteStore"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@
7474
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
7575
</after>
7676
<!--Grab new store view code-->
77-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToNewWebsitePage"/>
78-
<waitForPageLoad stepKey="waitForStoresPageLoad"/>
77+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="navigateToNewWebsitePage"/>
7978
<fillField userInput="{{NewWebSiteData.name}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
8079
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
8180
<click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickFirstRow"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3030
</after>
3131

32-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
33-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
32+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
3433
<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
3534
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
3635
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
</actionGroup>
3737

3838
<!--Create Store view -->
39-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
40-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
39+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
4140
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
4241
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4342
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
</actionGroup>
3737

3838
<!--Create Store view -->
39-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
40-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
39+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
4140
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
4241
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4342
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
</after>
3434

3535
<!--Open Store Page -->
36-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
37-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
36+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
3837

3938
<!--Create Custom Store -->
4039
<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@
5656
<argument name="parentCategory" value="$$createNewRootCategoryA.name$$"/>
5757
</actionGroup>
5858
<!-- Change root category for Main Website Store. -->
59-
<amOnPage stepKey="s1" url="{{AdminSystemStorePage.url}}"/>
60-
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
59+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="s1"/>
6160
<click stepKey="s2" selector="{{AdminStoresGridSection.resetButton}}"/>
6261
<waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterResetButton" time="10"/>
6362
<fillField stepKey="s4" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
</actionGroup>
3535

3636
<!--Create Store view -->
37-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
38-
<waitForPageLoad stepKey="waitForAdminSystemStorePage"/>
37+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
3938
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
4039
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4140
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<deleteData createDataKey="createSimpleProductTwo" stepKey="deleteSimpleProductTwo"/>
3737

3838
<!-- Delete the catalog price rule -->
39-
<amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
39+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
4040
<actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
4141
<argument name="name" value="{{_defaultCatalogRule.name}}"/>
4242
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
@@ -46,8 +46,7 @@
4646
</after>
4747

4848
<!-- 1. Begin creating a new catalog price rule -->
49-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
50-
<waitForPageLoad stepKey="waitForPriceRulePage"/>
49+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
5150
<click selector="{{AdminGridMainControls.add}}" stepKey="addNewRule"/>
5251
<waitForPageLoad stepKey="waitForIndividualRulePage"/>
5352
<fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{_defaultCatalogRule.name}}" stepKey="fillName"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@
105105
</after>
106106

107107
<!-- Delete the simple product and catalog price rule -->
108-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
109-
<waitForPageLoad stepKey="waitForPriceRulePage"/>
108+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage1"/>
110109
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule1">
111110
<argument name="name" value="{{DeleteActiveCatalogPriceRuleWithConditions.name}}"/>
112111
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

0 commit comments

Comments
 (0)