Skip to content

Commit b0712a0

Browse files
committed
MC-13728: Move MFTF Content From PageBuilder to CE/EE That Does Not Belong in PageBuilder
- Remove hardcoded selectors in actiongroup - Move PageBuilder action group back to Page Builder
1 parent 0b45ef1 commit b0712a0

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
<argument name="website" type="string"/>
261261
</arguments>
262262
<scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
263-
<conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeader}}._show" visible="false" stepKey="expandSection"/>
263+
<conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
264264
<waitForPageLoad stepKey="waitForPageOpened"/>
265265
<checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
266266
</actionGroup>
@@ -333,7 +333,7 @@
333333
<actionGroup name="expandAdminProductSection">
334334
<arguments>
335335
<argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
336-
<argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}._show" type="string"/>
336+
<argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeaderShow}}" type="string"/>
337337
</arguments>
338338
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
339339
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminProductContentSection">
1212
<element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
13+
<element name="sectionHeaderShow" type="button" selector="div[data-index='content']._show" timeout="30"/>
1314
<element name="descriptionTextArea" type="textarea" selector="#product_form_description"/>
1415
<element name="shortDescriptionTextArea" type="textarea" selector="#product_form_short_description"/>
1516
<element name="sectionHeaderIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>

app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,6 @@
8383
<amOnPage url="{{page}}" stepKey="goToStorefront"/>
8484
<waitForPageLoad stepKey="waitForPageLoad"/>
8585
</actionGroup>
86-
<actionGroup name="navigateToStoreFrontWithStoreView">
87-
<arguments>
88-
<argument name="contentType"/>
89-
<argument name="storeView"/>
90-
</arguments>
91-
<amOnPage url="{{storeView.code}}/{{contentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnStoreFrontPage"/>
92-
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
93-
</actionGroup>
9486
<actionGroup name="saveCMSBlock">
9587
<waitForElementVisible selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="waitForSaveButton"/>
9688
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="clickSaveButton"/>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,6 @@
112112
<element name="ClearCompare" type="button" selector="#compare-clear-all"/>
113113
<element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
114114
<element name="SelectPageButton" type="button" selector="//button[@title='Select Page...']"/>
115-
<element name="generalFilter" type="input" selector="input.admin__control-text[name='{{arg1}}']" parameterized="true"/>
115+
<element name="SelectPageFilterInput" type="input" selector="input.admin__control-text[name='{{arg1}}']" parameterized="true"/>
116116
</section>
117117
</sections>

0 commit comments

Comments
 (0)