Skip to content

Commit 2769362

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #437 from magento-pangolin/MQE-1957
MQE-2046: remove deprecated entities usages in MFTF tests
2 parents 1605bd0 + bd8c1d5 commit 2769362

File tree

854 files changed

+1768
-1754
lines changed

Some content is hidden

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

854 files changed

+1768
-1754
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/SaveCatalogCategoryActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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="saveCatalogCategory" extends="SaveCategoryFormActionGroup">
10+
<actionGroup name="saveCatalogCategory" extends="AdminSaveCategoryFormActionGroup">
1111
<!-- Move to CE: Fix CE action group -->
1212
<waitForElementVisible selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="waitForSaveCategoryButton" before="saveCategory"/>
1313
<waitForPageLoad stepKey="waitForPageLoad" after="saveCategory"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/PageBuilderCmsBlockDisablePageBuilderTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
</annotations>
2323
<before>
2424
<createData entity="_emptyCmsBlock" stepKey="createPreReqBlock" after="loginAsAdmin"/>
25-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
2727
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2828
</actionGroup>
2929
</before>
3030
<after>
3131
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
33-
<actionGroup ref="logout" stepKey="logout"/>
33+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3434
</after>
3535
<seeElement selector="{{PageBuilderStage.stageWrapper}}" stepKey="seeElementPageBuilderStage"/>
3636
<dontSeeElementInDOM selector="{{CmsNewBlockBlockBasicFieldsSection.content_textarea}}" stepKey="dontSeeContentAreaInDOM"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
24-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<createData entity="_defaultBlock" stepKey="createPreReqBlock"/>
2626
</before>
2727
<after>
2828
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
2929
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
30-
<actionGroup ref="logout" stepKey="logout"/>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3131
</after>
3232
<!--Create CMS Block using PageBuilder-->
3333
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/PageBuilderCmsPageDisablePageBuilderTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
25-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
2727
<argument name="CMSPage" value="$$createCMSPage$$"/>
2828
</actionGroup>
@@ -31,7 +31,7 @@
3131
<after>
3232
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
34-
<actionGroup ref="logout" stepKey="logout"/>
34+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3535
</after>
3636
<seeElement selector="{{PageBuilderStage.stageWrapper}}" stepKey="seeElementPageBuilderStage"/>
3737
<dontSeeElementInDOM selector="{{CmsNewPagePageContentSection.content}}" stepKey="dontSeeContentAreaInDOM"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateAndApplyTemplate.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
25-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
2727
<argument name="CMSPage" value="$$createCMSPage$$"/>
2828
</actionGroup>
@@ -40,7 +40,7 @@
4040
<actionGroup ref="navigateToPageBuilderTemplatesGridPage" stepKey="navigateToPageBuilderTemplatesGridPage"/>
4141
<actionGroup ref="searchByKeywordPageBuilderTemplateGrid" stepKey="searchByKeywordPageBuilderTemplateGrid"/>
4242
<actionGroup ref="deletePageBuilderTemplate" stepKey="deletePageBuilderTemplate"/>
43-
<actionGroup ref="logout" stepKey="logout"/>
43+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4444
</after>
4545
<!-- Save Template -->
4646
<actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<group value="pagebuilder-cms-page"/>
2222
</annotations>
2323
<before>
24-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2626
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2727
</before>
2828
<after>
29-
<actionGroup ref="logout" stepKey="logout"/>
29+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3030
</after>
3131
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
3232
<argument name="contentType" value="PageBuilderRowContentType"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithInvalidFullWidthLayoutTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<group value="pagebuilder-cms-page"/>
2222
</annotations>
2323
<before>
24-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2626
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2727
</before>
2828
<after>
29-
<actionGroup ref="logout" stepKey="logout"/>
29+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3030
<closeTab stepKey="closeTab"/>
3131
</after>
3232
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageBuilderEnableOnCMSPageWhenPageBuilderEnabledAndWYSIWYGEnabledTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
24-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
2626
</before>
2727
<after>
2828
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
2929
<deleteData createDataKey="createPreReqCMSPage" stepKey="deletePreReqCMSPage"/>
30-
<actionGroup ref="logout" stepKey="logout"/>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3131
</after>
3232
<!--Create CMS Page using PageBuilder-->
3333
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCatalogCategoryDisablePageBuilderTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<createData entity="_defaultCategory" stepKey="createCategory"/>
25-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedCategory">
2727
<argument name="Category" value="$$createCategory$$"/>
2828
</actionGroup>
@@ -31,7 +31,7 @@
3131
<after>
3232
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
3333
<deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
34-
<actionGroup ref="logout" stepKey="logout"/>
34+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3535
</after>
3636
<seeElement selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" stepKey="seePageBuilderButton"/>
3737
<dontSeeElementInDOM selector="{{CategoryContentSection.descriptionTextArea}}" stepKey="dontSeeDescriptionAreaInDOM"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAndInvalidPageLayoutTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
</annotations>
2424
<before>
2525
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
26-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
26+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2727
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedProductEditPage">
2828
<argument name="Category" value="$$createPreReqCategory$$"/>
2929
</actionGroup>
3030
<actionGroup ref="expandAdminCategorySection" stepKey="expandAdminCategorySection"/>
3131
</before>
3232
<after>
3333
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
34-
<actionGroup ref="logout" stepKey="logout"/>
34+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3535
<closeTab stepKey="closeTab"/>
3636
</after>
3737
<actionGroup ref="openPageBuilderForAttribute" stepKey="enablePageBuilderOnCatalog"/>

0 commit comments

Comments
 (0)