Skip to content

Commit e80423c

Browse files
committed
Minor fixes for magento-commerce/magento-functional-tests-migration#323: Convert AccessAdminWithStoreCodeInUrlTest to MFTF
1 parent 277e19a commit e80423c

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertDashboardPageIsVisibleActionGroup.xml renamed to app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminDashboardPageIsVisibleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminAssertDashboardPageIsVisibleActionGroup">
11+
<actionGroup name="AssertAdminDashboardPageIsVisibleActionGroup">
1212
<seeInCurrentUrl url="{{AdminDashboardPage.url}}" stepKey="seeDashboardUrl"/>
1313
<see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
1414
</actionGroup>

app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<features value="Backend"/>
1414
<title value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
1515
<description value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
16+
<testCaseId value="MC-14279" />
1617
<group value="backend"/>
1718
<group value="mtf_migrated"/>
1819
</annotations>
@@ -24,6 +25,6 @@
2425
</after>
2526

2627
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
27-
<actionGroup ref="AdminAssertDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
28+
<actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
2829
</test>
2930
</tests>

app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontAssertStoreCodeInUrlActionGroup.xml renamed to app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStorefrontStoreCodeInUrlActionGroup.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="StorefrontAssertStoreCodeInUrlActionGroup">
11-
<seeInCurrentUrl url="{{StorefrontHomePage.url}}{{_defaultStore.code}}" stepKey="seeStoreCodeInURL"/>
10+
<actionGroup name="AssertStorefrontStoreCodeInUrlActionGroup">
11+
<arguments>
12+
<argument name="storeCode" type="string" defaultValue="{{_defaultStore.code}}" />
13+
</arguments>
14+
<seeInCurrentUrl url="{{StorefrontHomePage.url}}{{storeCode}}" stepKey="seeStoreCodeInURL"/>
1215
</actionGroup>
1316
</actionGroups>

app/code/Magento/Store/Test/Mftf/Test/StorefrontAddStoreCodeInUrlTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<features value="Backend"/>
1414
<title value="Store code should be added to storefront URL if the corresponding configuration is enabled"/>
1515
<description value="Store code should be added to storefront URL if the corresponding configuration is enabled"/>
16+
<testCaseId value="MC-15944" />
1617
<group value="store"/>
1718
<group value="mtf_migrated"/>
1819
</annotations>
@@ -24,6 +25,6 @@
2425
</after>
2526

2627
<actionGroup ref="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
27-
<actionGroup ref="StorefrontAssertStoreCodeInUrlActionGroup" stepKey="seeStoreCodeInUrl"/>
28+
<actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeStoreCodeInUrl"/>
2829
</test>
2930
</tests>

app/code/Magento/Theme/Test/Mftf/ActionGroup/StorefrontClickOnHeaderLogoActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="StorefrontClickOnHeaderLogoActionGroup">
11-
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="gotToHomePage"/>
12-
<waitForPageLoad stepKey="waitForHomePageLoaded1"/>
11+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
12+
<waitForPageLoad stepKey="waitForHomePageLoaded"/>
1313
<click selector="{{StorefrontHeaderSection.logoLink}}" stepKey="clickOnLogo"/>
14-
<waitForPageLoad stepKey="waitForHomePageLoaded2"/>
14+
<waitForPageLoad stepKey="waitForHomePageLoadedAfterClickOnLogo"/>
1515
</actionGroup>
1616
</actionGroups>

0 commit comments

Comments
 (0)