Skip to content

Commit 699ff67

Browse files
committed
MC-3330: Add Missing P0-P1 MFTF Tests For PageBuilder On Catalog Category
- Removing useless sections - Updating affected tests & actiongroup
1 parent acdfc75 commit 699ff67

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
<argument name="section"/>
4949
</arguments>
5050
<scrollTo selector="{{section.base('index')}}" stepKey="waitForButtonElementStorefront"/>
51-
<seeElement selector="{{PageBuilderPageOnStoreFrontSection.CMSPageLink(CMSPage.identifier)}}" stepKey="seePageLinkOnStoreFront" />
52-
<click selector="{{PageBuilderPageOnStoreFrontSection.CMSPageLink(CMSPage.identifier)}}" stepKey="clickButton"/>
51+
<seeElement selector="{{PageBuilderLinkAttributeStoreFront.ExternalURLLink(CMSPage.identifier)}}" stepKey="seePageLinkOnStoreFront"/>
52+
<click selector="{{PageBuilderLinkAttributeStoreFront.ExternalURLLink(CMSPage.identifier)}}" stepKey="clickLink"/>
5353
<waitForPageLoad stepKey="waitForPageLoad"/>
54-
<see userInput="{{CMSPage.title}}" stepKey="seePageName" />
54+
<see userInput="{{CMSPage.title}}" stepKey="seePageName"/>
5555
</actionGroup>
5656
</actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<element name="buttonItemTextByButtonGroup" type="button" selector="((//div[@data-content-type='buttons'])[{{arg1}}]//div[@data-content-type='button-item'])[{{arg2}}]//span[@data-element='link_text' and contains(.,'{{arg3}}')]" parameterized="true"/>
102102
<element name="buttonItemType" type="button" selector="(//div[@data-content-type='button-item'])[{{arg1}}]//a[@class='{{arg2}}']" parameterized="true"/>
103103
<element name="buttonItemUrl" type="button" selector="(//div[@data-content-type='button-item'])[{{arg1}}]//a[@href='{{arg2}}']" parameterized="true"/>
104+
<element name="buttonItemContainsUrl" type="button" selector="(//div[@data-content-type='button-item'])[{{arg1}}]//a[contains(@href,'{{arg2}}')]" parameterized="true"/>
104105
<element name="buttonItemNewTab" type="button" selector="(//div[@data-content-type='button-item'])[{{arg1}}]//a[@target='{{arg2}}']" parameterized="true"/>
105106
<!-- Advanced Configuration -->
106107
<element name="defaultStyle" type="button" selector="(//div[@data-content-type='button-item'])[{{arg1}}]//a[not(@style)]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@
3333
<element name="PageBuilderArea" type="text" selector="[data-index='{{var1}}'] button.action-default" parameterized="true"/>
3434
</section>
3535
<section name="StorefrontCategoryMainSection">
36+
<!-- This goes in CE repo -->
3637
<element name="CatalogDescription" type="text" selector="//div[@class='category-description']"/>
3738
</section>
38-
<section name="PageBuilderCatalogOnStoreFrontSection">
39-
<element name="CategoryLink" type="text" selector="//a[@class='pagebuilder-button-primary' and contains(@href,'{{var1}}')]" parameterized="true"/>
40-
<element name="ProductLink" type="text" selector="//a[@class='pagebuilder-button-primary' and contains(@href,'{{var1}}')]" parameterized="true"/>
41-
</section>
4239
<section name="CategoryContentSection">
4340
<!-- This goes in CE repo -->
4441
<element name="descriptionTextArea" type="text" selector="#category_form_description"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
<element name="computedWidth" type="text" selector="return parseInt(window.getComputedStyle(document.querySelectorAll('div[data-content-type=\'{{arg1}}\']')[{{arg2}}]).width)" parameterized="true"/>
1717
</section>
1818
<section name="PageBuilderLinkAttributeStoreFront">
19+
<element name="ExternalURLLink" type="text" selector="//a[@href='{{var1}}']" parameterized="true"/>
1920
<element name="ExternalURLInCurrentTab" type="text" selector="//a[@href='{{var1}}' and @target='']" parameterized="true"/>
2021
<element name="ExternalURLInNewTab" type="text" selector="//a[@href='{{var1}}' and @target='_blank']" parameterized="true"/>
2122
</section>
22-
<section name="PageBuilderPageOnStoreFrontSection">
23-
<element name="CMSPageLink" type="text" selector="//a[@class='pagebuilder-button-primary' and contains(@href,'{{var1}}')]" parameterized="true"/>
24-
</section>
2523
</sections>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,8 @@
13771377
<!--Go to storefront to verify Category Link-->
13781378
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
13791379
<waitForPageLoad stepKey="waitForPageLoad1"/>
1380-
<seeElement selector="{{PageBuilderCatalogOnStoreFrontSection.CategoryLink($createSubCategoryY.name_lwr$)}}" stepKey="seeExternalLinkOnStoreFront" />
1380+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="seeButtonItemOnStoreFront"/>
1381+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemContainsUrl('1', $createSubCategoryY.name_lwr$)}}" stepKey="seeExternalLinkOnStoreFront" />
13811382
<click selector=".pagebuilder-button-primary" stepKey="clickButton"/>
13821383
<waitForPageLoad stepKey="waitForPageLoad"/>
13831384
<see userInput="$createSubCategoryY.name$" stepKey="seeCategoryName" />
@@ -1483,7 +1484,8 @@
14831484
<!--Go to storefront to verify Product Link-->
14841485
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
14851486
<waitForPageLoad stepKey="waitForPageLoad1"/>
1486-
<seeElement selector="{{PageBuilderCatalogOnStoreFrontSection.ProductLink($createPreReqProduct2.name$)}}" stepKey="seeExternalLinkOnStoreFront" />
1487+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="seeButtonItemOnStoreFront"/>
1488+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemContainsUrl('1', $createPreReqProduct2.name$)}}" stepKey="seeExternalLinkOnStoreFront" />
14871489
<click selector=".pagebuilder-button-primary" stepKey="clickButton"/>
14881490
<waitForPageLoad stepKey="waitForPageLoad"/>
14891491
<see userInput="$createPreReqProduct2.name$" stepKey="seeProductName" />
@@ -1586,7 +1588,8 @@
15861588
<!--Go to storefront to verify CMS Page Link-->
15871589
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
15881590
<waitForPageLoad stepKey="waitForPageLoad1"/>
1589-
<seeElement selector="{{PageBuilderPageOnStoreFrontSection.CMSPageLink($createCMSPageB.identifier$)}}" stepKey="seePageLinkOnStoreFront" />
1591+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="seeButtonItemOnStoreFront"/>
1592+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemContainsUrl('1', $createCMSPageB.identifier$)}}" stepKey="seePageLinkOnStoreFront" />
15901593
<click selector=".pagebuilder-button-primary" stepKey="clickButton"/>
15911594
<waitForPageLoad stepKey="waitForPageLoad"/>
15921595
<see userInput="$createCMSPageB.title$" stepKey="seePageName" />

0 commit comments

Comments
 (0)