Skip to content

Commit 0126ccb

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-7843: [MFTF] created ActionGroup to go to AdminSystemStorePage #29162
- Merge Pull Request #29162 from Usik2203/magento2:AdminSystemStorePage-url - Merged commits: 1. 968f93b 2. 9009663
2 parents c36db34 + 9009663 commit 0126ccb

12 files changed

+30
-21
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/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</actionGroup>
9595

9696
<!--Create Store view -->
97-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
97+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
9898
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
9999
<waitForPageLoad stepKey="waitForProductPageLoad"/>
100100
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>

‎app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2727
<!--Create new website,store and store view-->
2828
<comment userInput="Create new website,store and store view" stepKey="createWebsite"/>
29-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
29+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="goToAdminSystemStorePage"/>
3030
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
3131
<argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
3232
<argument name="websiteCode" value="{{NewWebSiteData.code}}"/>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSystemStoreOpenPageActionGroup.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="AdminSystemStoreOpenPageActionGroup">
12+
<annotations>
13+
<description>Go to admin system store page.</description>
14+
</annotations>
15+
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToSystemStore"/>
16+
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml

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

3535
<!--Filter grid and see created store view-->
36-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
36+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="navigateToStoresIndex"/>
3737
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
3838
<fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
3939
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>

0 commit comments

Comments
 (0)