Skip to content

Commit 6feedb2

Browse files
dthampydthampy
committed
MAGETWO-91545: 404 Error not found page issue in change status and update attribute from product grid
- added functional test to cover the bug fix
1 parent b191bdb commit 6feedb2

File tree

6 files changed

+48
-16
lines changed

6 files changed

+48
-16
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
<data key="is_active">true</data>
3131
<data key="current_password">123123q</data>
3232
</entity>
33-
<entity name="restrictedCatalogProductUser" type="user">
34-
<data key="username" unique="suffix">restrictedUser</data>
35-
<data key="firstname">RestrictedCatalogUser</data>
36-
<data key="lastname">Product</data>
33+
<entity name="restrictedCatalogUser" type="user">
34+
<data key="username" unique="suffix">restrictedCatalogUser</data>
35+
<data key="firstname">restricted</data>
36+
<data key="lastname">catalogUser</data>
3737
<data key="email" unique="prefix">restrictedCatalogUser@example.com</data>
3838
<data key="password">123123q</data>
3939
<data key="password_confirmation">123123q</data>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,27 @@
2121

2222
<after>
2323
<actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
24-
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite"/>
24+
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
25+
<argument name="websiteName" value="Second Website"/>
26+
</actionGroup>
2527

2628
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
2729
</after>
2830
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2931
<actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
30-
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="addnewWebsite"/>
31-
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="addNewStoreGroup"/>
32+
33+
<!--Create new website -->
34+
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
35+
<argument name="newWebsiteName" value="Second Website"/>
36+
<argument name="websiteCode" value="second_website"/>
37+
</actionGroup>
38+
39+
<!--Create new Store Group -->
40+
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
41+
<argument name="website" value="Second Website"/>
42+
<argument name="storeGroupName" value="Second Store"/>
43+
<argument name="storeGroupCode" value="second_store"/>
44+
</actionGroup>
3245

3346
<!--Create Store view -->
3447
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,15 @@
7878
</after>
7979

8080
<actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
81-
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="addnewWebsite"/>
82-
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="addNewStoreGroup"/>
81+
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="addNewWebsite">
82+
<argument name="newWebsiteName" value="Second Website"/>
83+
<argument name="websiteCode" value="second_website"/>
84+
</actionGroup>
85+
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="addNewStoreGroup">
86+
<argument name="website" value="Second Website"/>
87+
<argument name="storeGroupName" value="Second Store"/>
88+
<argument name="storeGroupCode" value="second_store"/>
89+
</actionGroup>
8390

8491
<!--Create Store view -->
8592
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,17 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminCreateNewStoreGroupActionGroup">
12+
<arguments>
13+
<argument name="website" type="string"/>
14+
<argument name="storeGroupName" type="string"/>
15+
<argument name="storeGroupCode" type="string"/>
16+
</arguments>
1217
<amOnPage url="{{AdminSystemStoreGroupPage.url}}" stepKey="navigateToNewStoreView"/>
1318
<waitForPageLoad stepKey="waitForPageLoad1" />
1419
<!--Create Store group -->
15-
<selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="Second Website" stepKey="selectWebsite" />
16-
<fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="Second Store" stepKey="enterStoreGroupName" />
17-
<fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="second_store" stepKey="enterStoreGroupCode" />
20+
<selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="selectWebsite" />
21+
<fillField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="enterStoreGroupName" />
22+
<fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="enterStoreGroupCode" />
1823
<selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
1924
<click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
2025
<waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminCreateWebsiteActionGroup">
12+
<arguments>
13+
<argument name="newWebsiteName" type="string"/>
14+
<argument name="websiteCode" type="string"/>
15+
</arguments>
1216
<amOnPage url="{{AdminSystemStoreWebsitePage.url}}" stepKey="navigateToNewWebsitePage"/>
1317
<waitForPageLoad stepKey="waitForStoresPageLoad"/>
1418
<!--Create Website-->
15-
<fillField selector="{{AdminNewWebsiteSection.name}}" userInput="Second Website" stepKey="enterWebsiteName" />
16-
<fillField selector="{{AdminNewWebsiteSection.code}}" userInput="second_website" stepKey="enterWebsiteCode" />
19+
<fillField selector="{{AdminNewWebsiteSection.name}}" userInput="{{newWebsiteName}}" stepKey="enterWebsiteName" />
20+
<fillField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="enterWebsiteCode" />
1721
<click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite" />
1822
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
1923
<see userInput="You saved the website." stepKey="seeSavedMessage" />

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="AdminDeleteWebsiteActionGroup">
11+
<arguments>
12+
<argument name="websiteName" type="string"/>
13+
</arguments>
1114
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
1215
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
13-
<fillField userInput="Second Website" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
16+
<fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
1417
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
15-
<see userInput="Second Website" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
18+
<see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
1619
<click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
1720
<waitForPageLoad stepKey="waitForStoreToLoad"/>
1821
<click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/>

0 commit comments

Comments
 (0)