Skip to content

Commit baa05cb

Browse files
dhaeckerdhaecker
committed
MC-2213: Split Section File
- Combining ContentManagementSection.xml & PageBuilderConfigSection.xml files - Updating affected tests & action groups
1 parent f7d43b6 commit baa05cb

File tree

4 files changed

+30
-49
lines changed

4 files changed

+30
-49
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@
4848
<!-- NOW disable -->
4949
<amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage2" />
5050
<waitForPageLoad stepKey="waitForPageLoad2"/>
51-
<conditionalClick stepKey="expandPageBuilderTab" selector="{{PageBuilderCollapsibleSection.AdvancedContentToolsTab}}" dependentSelector="{{PageBuilderCollapsibleSection.CheckIfTabOpen}}" visible="true" />
52-
<waitForElementVisible selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" stepKey="waitForEnablePageBuilderVisible" />
53-
<selectOption selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="selectNo"/>
54-
<waitForElementVisible selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="waitForPopUpMsg2"/>
55-
<waitForElementVisible selector="{{PageBuilderCollapsibleSection.TurnOffBtn}}" stepKey="waitForTurnOffButton"/>
56-
<click selector="{{PageBuilderCollapsibleSection.TurnOffBtn}}" stepKey="selectTurnOff" />
57-
<waitForElementNotVisible selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="waitForPopupClose2"/>
58-
<seeOptionIsSelected selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="verifyNoSelected"/>
59-
<click selector="{{PageBuilderCollapsibleSection.AdvancedContentToolsTab}}" stepKey="collapseAdvancedContentToolsTab" />
51+
<conditionalClick stepKey="expandPageBuilderTab" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true" />
52+
<waitForElementVisible selector="{{ContentManagementSection.EnablePageBuilder}}" stepKey="waitForEnablePageBuilderVisible" />
53+
<selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="No" stepKey="selectNo"/>
54+
<waitForElementVisible selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="waitForPopUpMsg2"/>
55+
<waitForElementVisible selector="{{ContentManagementSection.TurnOffBtn}}" stepKey="waitForTurnOffButton"/>
56+
<click selector="{{ContentManagementSection.TurnOffBtn}}" stepKey="selectTurnOff" />
57+
<waitForElementNotVisible selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="waitForPopupClose2"/>
58+
<seeOptionIsSelected selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="No" stepKey="verifyNoSelected"/>
59+
<click selector="{{ContentManagementSection.PageBuilderOptions}}" stepKey="collapseAdvancedContentToolsTab" />
6060
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig2" />
6161
<waitForPageLoad stepKey="waitForPageLoad3"/>
6262
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/ContentManagementSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<element name="CheckIfPageBuilderTabExpanded" type="button" selector="#cms_pagebuilder-head:not(.open)"/>
1515
<element name="EnablePageBuilderSystemValue" type="button" selector="#cms_pagebuilder_enabled_inherit"/>
1616
<element name="EnablePageBuilder" type="button" selector="#cms_pagebuilder_enabled"/>
17+
<element name="DisclaimerMessage" type="text" selector="//aside[@data-type='popup']//div[@class='modal-inner-wrap']"/>
18+
<element name="CancelBtn" type="button" selector=".action-pagebuilder-cancel"/>
19+
<element name="TurnOffBtn" type="button" selector=".action-accept"/>
1720
<element name="ConfigurationFieldLabel" type="button" selector="//div[contains(@class,'form-inline')]//fieldset[@id='{{arg1}}']//tr[@id='{{arg2}}']//span[.='{{arg3}}']" parameterized="true"/>
1821
<element name="GoogleMapsAPIKeyInputField" type="input" selector="#cms_pagebuilder_google_maps_api_key"/>
1922
<element name="GoogleMapsAPIKeyTestKeyButton" type="button" selector="#cms_pagebuilder_google_maps_api_key_validator"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderConfigSection.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderEnabledTest.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,31 @@
3131
<amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage" />
3232
<waitForPageLoad stepKey="waitForPageLoad"/>
3333
<see userInput="Advanced Content Tools" stepKey="seeAdvancedContentToolTab"/>
34-
<conditionalClick stepKey="expandPageBuilderTab" selector="{{PageBuilderCollapsibleSection.AdvancedContentToolsTab}}" dependentSelector="{{PageBuilderCollapsibleSection.CheckIfTabOpen}}" visible="true" />
35-
<waitForElementVisible selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" stepKey="waitForEnablePageBuilderVisible" />
36-
<seeOptionIsSelected selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="Yes" stepKey="seeYESOptionIsSelected"/>
34+
<conditionalClick stepKey="expandPageBuilderTab" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true" />
35+
<waitForElementVisible selector="{{ContentManagementSection.EnablePageBuilder}}" stepKey="waitForEnablePageBuilderVisible" />
36+
<seeOptionIsSelected selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="Yes" stepKey="seeYESOptionIsSelected"/>
3737
<grabTextFrom selector="//tr[@id='row_cms_pagebuilder_enabled']/td[@class='value']//span" stepKey="grabTextFromDisclaimerMsg"/>
3838
<assertEquals stepKey="assertEquals2" expected="Includes advanced tools to design page layouts, add Magento content (Product and Category data, CMS content and Blocks), and format text.\n\nFor Product Attributes — Page Builder can be selected as the “input type” to design layouts and create content." expectedType="string" actual="grabTextFromDisclaimerMsg" actualType="variable" message="pass"/>
3939

4040
<!--Disable PageBuilder-->
41-
<selectOption selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="selectNO1"/>
42-
<waitForElementVisible selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="waitForPopUpMsg1" />
43-
<seeElement selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="seePopUp1" />
44-
<click selector="{{PageBuilderCollapsibleSection.CancelBtn}}" stepKey="selectCancel" />
45-
<dontSee selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="popupClose1"/>
46-
<seeOptionIsSelected selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="Yes" stepKey="seeYesIsSelected" />
47-
<selectOption selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="selectNO2"/>
48-
<waitForElementVisible selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="waitForPopUpMsg2"/>
49-
<click selector="{{PageBuilderCollapsibleSection.TurnOffBtn}}" stepKey="selectTurnOff" />
50-
<dontSee selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="popupClose2"/>
51-
<seeOptionIsSelected selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="seeNoIsSelected" />
41+
<selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="No" stepKey="selectNO1"/>
42+
<waitForElementVisible selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="waitForPopUpMsg1" />
43+
<seeElement selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="seePopUp1" />
44+
<click selector="{{ContentManagementSection.CancelBtn}}" stepKey="selectCancel" />
45+
<dontSee selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="popupClose1"/>
46+
<seeOptionIsSelected selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="Yes" stepKey="seeYesIsSelected" />
47+
<selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="No" stepKey="selectNO2"/>
48+
<waitForElementVisible selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="waitForPopUpMsg2"/>
49+
<click selector="{{ContentManagementSection.TurnOffBtn}}" stepKey="selectTurnOff" />
50+
<dontSee selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="popupClose2"/>
51+
<seeOptionIsSelected selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="No" stepKey="seeNoIsSelected" />
5252
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
5353

5454
<!-- I switch between NO -> YES - > NO without saving the Config, Then: Warning message will not appear on page-->
55-
<selectOption selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="selectNO3"/>
56-
<selectOption selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="Yes" stepKey="selectYes"/>
57-
<selectOption selector="{{PageBuilderCollapsibleSection.EnablePageBuilderDrp}}" userInput="No" stepKey="selectNO4"/>
58-
<dontSee selector="{{PageBuilderCollapsibleSection.DisclaimerMessage}}" stepKey="dontSeePopUp"/>
55+
<selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="No" stepKey="selectNO3"/>
56+
<selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="Yes" stepKey="selectYes"/>
57+
<selectOption selector="{{ContentManagementSection.EnablePageBuilder}}" userInput="No" stepKey="selectNO4"/>
58+
<dontSee selector="{{ContentManagementSection.DisclaimerMessage}}" stepKey="dontSeePopUp"/>
5959
</test>
6060
<test name="VerifyPageBuilderVisibleOnCatalog">
6161
<annotations>

0 commit comments

Comments
 (0)