magento#27503 Final fix for Page name violation

lbajsarowicz · Apr 5, 2020 · 9fab7a1 · 9fab7a1
1 parent 87b7cba
commit 9fab7a1
Show file tree

Hide file tree

Showing 263 changed files with 328 additions and 346 deletions.
diff --git a/...rationStoresPage/WebConfigurationPage.xml → ...ftf/Page/AdminConfigurationStoresPage.xml b/...rationStoresPage/WebConfigurationPage.xml → ...ftf/Page/AdminConfigurationStoresPage.xml
@@ -7,7 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="WebConfigurationPage" url="admin/system_config/edit/section/web/" area="admin" module="Backend">
+    <page name="AdminConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
         <section name="WYSIWYGOptionsSection"/>
     </page>
 </pages>
diff --git a/...onStoresPage/GeneralConfigurationPage.xml → ...tf/Page/AdminGeneralConfigurationPage.xml b/...onStoresPage/GeneralConfigurationPage.xml → ...tf/Page/AdminGeneralConfigurationPage.xml
@@ -7,7 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="GeneralConfigurationPage" url="admin/system_config/edit/section/general/" area="admin" module="Backend">
+    <page name="AdminGeneralConfigurationPage" url="admin/system_config/edit/section/general/" area="admin" module="Backend">
         <section name="LocaleOptionsSection"/>
     </page>
 </pages>
diff --git a/...ionStoresPage/ConfigurationStoresPage.xml → ...t/Mftf/Page/AdminWebConfigurationPage.xml b/...ionStoresPage/ConfigurationStoresPage.xml → ...t/Mftf/Page/AdminWebConfigurationPage.xml
@@ -7,7 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
+    <page name="AdminWebConfigurationPage" url="admin/system_config/edit/section/web/" area="admin" module="Backend">
         <section name="WYSIWYGOptionsSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
@@ -94,7 +94,7 @@
         </actionGroup>
 
         <!--Navigate to Product attribute page-->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <amOnPage url="{{AdminProductAttributeFormPage.url}}" stepKey="navigateToNewProductAttributePage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <fillField userInput="test_label" selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="fillDefaultLabel"/>
         <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Swatch" stepKey="selectInputType"/>

diff --git a/...Backup/Test/Mftf/Page/BackupIndexPage.xml → ...p/Test/Mftf/Page/AdminBackupIndexPage.xml b/...Backup/Test/Mftf/Page/BackupIndexPage.xml → ...p/Test/Mftf/Page/AdminBackupIndexPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="BackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
+    <page name="AdminBackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
         <section name="AdminMainActionsSection"/>
         <section name="AdminGridTableSection"/>
         <section name="AdminCreateBackupFormSection"/>

diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
@@ -26,7 +26,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!--Go to backup index page-->
-        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupPage"/>
+        <amOnPage url="{{AdminBackupIndexPage.url}}" stepKey="goToBackupPage"/>
         <waitForPageLoad stepKey="waitForBackupPage"/>
 
         <!--Create system backup-->

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/FindProductToEditActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/FindProductToEditActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Clears the Backend Admin Grid Filters on the Backend Admin Product Grid page. Searches for the BundleProduct Data Entity. Then clicks on the first item in the Admin Grid. PLEASE NOTE: The Action Group values are Hardcoded.</description>
         </annotations>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+        <amOnPage url="{{AdminProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
         <waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <fillField userInput="{{BundleProduct.name}}" selector="#fulltext" stepKey="EnterProductNameInSearch"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
@@ -32,7 +32,7 @@
                 <!--Clear Configs-->
                 <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
                 <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
-                <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
+                <amOnPage url="{{AdminConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
                 <waitForPageLoad stepKey="waitForConfigCurrencySetupPageForUnselectEuroCurrency"/>
                 <unselectOption selector="{{CurrencySetupSection.allowCurrencies}}" userInput="Euro" stepKey="unselectEuro"/>
                 <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
@@ -59,7 +59,7 @@
             <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '0')}}" stepKey="userDefinedQuantitiyOptionProduct0"/>
             <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '1')}}" stepKey="userDefinedQuantitiyOptionProduct1"/>
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
-            <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
+            <amOnPage url="{{AdminConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
             <waitForPageLoad stepKey="waitForConfigCurrencySetupPage"/>
             <conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.allowCurrencies}}" visible="false" stepKey="openOptions"/>
             <waitForPageLoad stepKey="waitForOptions"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -129,7 +129,7 @@
         <dontSeeElement stepKey="LookingForNameOfProductDisabled" selector="{{StorefrontBundledSection.bundleProductName}}"/>
 
         <!--Enabling bundle products-->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
+        <amOnPage url="{{AdminProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
         <waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
         <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
         <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -79,7 +79,7 @@
         <waitForPageLoad stepKey="waitForElementAdded"/>
 
         <!-- Go to the shopping cart page and grab the value of the option title -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
         <waitForPageLoad stepKey="waitForCartPageLoad"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
 
@@ -100,7 +100,7 @@
         <see stepKey="assertSuccess2" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
 
         <!-- Go to the shopping cart page and make sure the title has changed -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart1"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="onPageShoppingCart1"/>
         <waitForPageLoad stepKey="waitForCartPageLoad1"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalAfter"/>
         <assertNotEquals stepKey="assertNotEquals">

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
@@ -100,7 +100,7 @@
         <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{BundleProduct.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
 
         <!-- Verify cart contents -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="goToCart"/>
         <waitForPageLoad stepKey="waitForCart"/>
         <see selector="{{StorefrontBundledSection.nthItemOptionsTitle('1')}}" userInput="Option One" stepKey="seeOption1"/>
         <see selector="{{StorefrontBundledSection.nthItemOptionsTitle('2')}}" userInput="Option Two" stepKey="seeOption2"/>

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -88,7 +88,7 @@
         <waitForPageLoad stepKey="waitForElementAdded2"/>
 
         <!-- Go to the shopping cart page and edit the first product -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
         <waitForPageLoad stepKey="waitForCartPageLoad"/>
         <waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
         <waitForPageLoad stepKey="waitForCartPageLoad3"/>
@@ -106,7 +106,7 @@
         <waitForPageLoad stepKey="waitForElementAdded3"/>
 
         <!-- Go to the shopping cart page -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart2"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="onPageShoppingCart2"/>
         <waitForPageLoad stepKey="waitForCartPageLoad2"/>
 
         <!-- Assert that the options are both there and the proce no longer matches -->

diff --git a/...gento/Catalog/Test/Mftf/ActionGroup/AdminNavigateToNewProductAttributePageActionGroup.xml b/...gento/Catalog/Test/Mftf/ActionGroup/AdminNavigateToNewProductAttributePageActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Go to the create new product attribute page</description>
         </annotations>
 
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
+        <amOnPage url="{{AdminProductAttributeFormPage.url}}" stepKey="goToNewProductAttributePage"/>
         <waitForPageLoad stepKey="waitForAttributePageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/...code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeMassUpdateActionGroup.xml b/...code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeMassUpdateActionGroup.xml
@@ -17,7 +17,7 @@
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickOption"/>
         <waitForPageLoad stepKey="waitForUploadPage"/>
-        <seeInCurrentUrl url="{{ProductAttributesEditPage.url}}" stepKey="seeAttributePageEditUrl"/>
+        <seeInCurrentUrl url="{{AdminProductAttributesEditPage.url}}" stepKey="seeAttributePageEditUrl"/>
         <click selector="{{AdminUpdateAttributesSection.toggleName}}" stepKey="clickToChangeName"/>
         <fillField selector="{{AdminUpdateAttributesSection.name}}" userInput="{{product.name}}" stepKey="fillFieldName"/>
         <click selector="{{AdminUpdateAttributesSection.toggleDescription}}" stepKey="clickToChangeDescription"/>

diff --git a/...gento/Catalog/Test/Mftf/ActionGroup/AssertErrorMessageAfterDeletingWebsiteActionGroup.xml b/...gento/Catalog/Test/Mftf/ActionGroup/AssertErrorMessageAfterDeletingWebsiteActionGroup.xml
@@ -16,7 +16,7 @@
             <argument name="errorMessage" type="string"/>
         </arguments>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <amOnPage url="{{AdminProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
         <waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
         <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonFromAdminCategoryModalSection"/>
         <see selector="{{AdminCategoryMessagesSection.errorMessage}}" userInput="{{errorMessage}}" stepKey="seeAssertErrorMessage"/>

diff --git a/...agento/Catalog/Test/Mftf/ActionGroup/FilterProductInGridByStoreViewAndNameActionGroup.xml b/...agento/Catalog/Test/Mftf/ActionGroup/FilterProductInGridByStoreViewAndNameActionGroup.xml
@@ -16,8 +16,8 @@
             <argument name="storeView" type="string"/>
             <argument name="productName" type="string"/>
         </arguments>
-        
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchProduct"/>
+
+        <amOnPage url="{{AdminProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchProduct"/>
         <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
@@ -7,7 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="ProductAttributePage" url="catalog/product_attribute/new/" area="admin" module="Catalog">
+    <page name="AdminProductAttributeFormPage" url="catalog/product_attribute/new/" area="admin" module="Catalog">
         <section name="AdminCreateProductAttributeSection"/>
         <section name="AdminProductAttributeManageLabelsSection"/>
     </page>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
@@ -7,7 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="ProductAttributesEditPage" url="catalog/product_action_attribute/edit/" area="admin" module="Catalog">
+    <page name="AdminProductAttributesEditPage" url="catalog/product_action_attribute/edit/" area="admin" module="Catalog">
         <section name="AdminEditProductAttributesSection"/>
     </page>
 </pages>
diff --git a/...log/Test/Mftf/Page/ProductCatalogPage.xml → ...est/Mftf/Page/AdminProductCatalogPage.xml b/...log/Test/Mftf/Page/ProductCatalogPage.xml → ...est/Mftf/Page/AdminProductCatalogPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="ProductCatalogPage" url="/catalog/product/" area="admin" module="Magento_Catalog">
+    <page name="AdminProductCatalogPage" url="/catalog/product/" area="admin" module="Magento_Catalog">
         <section name="ProductCatalogPageSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml
@@ -77,7 +77,7 @@
         </actionGroup>
 
         <!-- Check that cart page contains cross-sell to simpleProduct2 and simpleProduct3-->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart1"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="goToCart1"/>
         <waitForPageLoad stepKey="waitForCartToLoad"/>
         <waitForElementVisible selector="{{CheckoutCartCrossSellSection.products}}" stepKey="waitForCrossSellLoading"/>
         <see stepKey="seeProduct2InCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct2.name$"/>

diff --git a/...alog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/...alog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -171,7 +171,7 @@
         <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="25" stepKey="selectProductTierPricePercentageValue2"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton4"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct4"/>
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage1"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="goToShoppingCartPage1"/>
         <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad1"/>
         <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField4"/>
@@ -198,7 +198,7 @@
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig1"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage1"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache1"/>
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage2"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="goToShoppingCartPage2"/>
         <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad2"/>
         <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_2"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField5"/>
@@ -212,7 +212,7 @@
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig2"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage2"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache2"/>
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage3"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="goToShoppingCartPage3"/>
         <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad3"/>
         <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_3"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField6"/>
@@ -250,7 +250,7 @@
         <waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="200" stepKey="fillProductPrice200"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage4"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="goToShoppingCartPage4"/>
         <waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad4"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField7"/>
         <assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
@@ -41,7 +41,7 @@
         </actionGroup>
 
         <!-- Go to the cart page and verify we see the product -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="gotoCart"/>
+        <amOnPage url="{{StorefrontCheckoutCartPage.url}}" stepKey="gotoCart"/>
         <waitForPageLoad stepKey="waitForCartLoad"/>
         <actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertProductItemInCheckOutCart">
             <argument name="productName" value="$$createProduct.name$$"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -91,7 +91,7 @@
         </after>
        <!--Verify default number of products displayed in the grid view-->
         <comment userInput="Verify default number of products displayed in the grid view" stepKey="commentVerifyDefaultValues"/>
-        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigPagePage"/>
+        <amOnPage url="{{AdminCatalogConfigPage.url}}" stepKey="goToCatalogConfigPagePage"/>
         <waitForPageLoad stepKey="waitForConfigPageLoad" />
         <conditionalClick selector="{{AdminCatalogStorefrontConfigSection.sectionHeader}}" dependentSelector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" visible="false" stepKey="openCatalogConfigStorefrontSection"/>
         <waitForElementVisible selector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" stepKey="waitForSectionOpen"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminConfigureProductImagePlaceholderTest.xml
@@ -37,7 +37,7 @@
 
         <after>
             <!--Unset product image placeholders-->
-            <amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPageAfter"/>
+            <amOnPage url="{{AdminCatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPageAfter"/>
             <waitForPageLoad stepKey="waitForConfigurationPageLoadAfter"/>
             <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSectionAfter"/>
             <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpenAfter"/>
@@ -67,7 +67,7 @@
 
         <!--Admin area: configure Product Image Placeholders-->
         <comment userInput="Configure product image placeholders in store config" stepKey="configurePlaceholderComment"/>
-        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPage"/>
+        <amOnPage url="{{AdminCatalogConfigPage.url}}" stepKey="goToCatalogConfigurationPage"/>
         <waitForPageLoad stepKey="waitForConfigurationPageLoad1"/>
         <conditionalClick selector="{{AdminProductImagePlaceholderConfigSection.sectionHeader}}" dependentSelector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" visible="false" stepKey="openPlaceholderSection1"/>
         <waitForElementVisible selector="{{AdminProductImagePlaceholderConfigSection.baseImageInput}}" stepKey="waitForPlaceholderSectionOpen1"/>