Skip to content

Commit 6eff748

Browse files
author
joiecaquicla
committed
Merge branch '636-functional-tests-on-mobile-viewport' of github.com:joweecaquicla/magento2-page-builder into 636-functional-tests-on-mobile-viewport
2 parents 49aa35e + 95353c8 commit 6eff748

File tree

3 files changed

+95
-40
lines changed

3 files changed

+95
-40
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonItemCanBeEditedInlineTest.xml

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Viewport Switcher"/>
14-
<title value="Button Item - Can Be Edited Inline On Mobile Viewport"/>
14+
<title value="Mobile Viewport: Inline Edit Button Item"/>
1515
<description value="A user should be able to edit a button item inline on the stage on mobile viewport"/>
1616
<severity value="CRITICAL"/>
1717
<group value="pagebuilder"/>
@@ -20,8 +20,11 @@
2020
<group value="pagebuilder-viewport-switcher"/>
2121
</annotations>
2222
<before>
23+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
2324
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
25+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToAPageWithPageBuilder">
26+
<argument name="CMSPage" value="$$createCMSPage$$"/>
27+
</actionGroup>
2528
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2629
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewport">
2730
<argument name="viewportButton" value="mobile"/>
@@ -30,11 +33,9 @@
3033
</before>
3134
<after>
3235
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
36+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3337
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3438
</after>
35-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
36-
<argument name="contentType" value="PageBuilderButtonsContentType"/>
37-
</actionGroup>
3839
<!-- Add Button Group -->
3940
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
4041
<argument name="contentType" value="PageBuilderButtonsContentType"/>
@@ -59,26 +60,43 @@
5960
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6061
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6162
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
63+
<!-- Validate Stage After Page Save Desktop Viewport -->
64+
<waitForElementVisible selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="waitForButtonTextStage2D1"/>
65+
<!-- Validate Edit Panel After Page Save Desktop Viewport -->
66+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage21">
67+
<argument name="section" value="ButtonItemOnStage"/>
68+
<argument name="targetIndex" value="1"/>
69+
</actionGroup>
70+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonText21">
71+
<argument name="property" value="PageBuilderButtonItemText_Common"/>
72+
</actionGroup>
73+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings21"/>
6274
<!-- Switch To Mobile Viewport After Save -->
6375
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewportAfterSave">
6476
<argument name="viewportButton" value="mobile"/>
6577
<argument name="viewportStage" value="mobile"/>
6678
</actionGroup>
67-
<!-- Validate Stage After Page Save -->
68-
<waitForElementVisible selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="waitForButtonTextStage2"/>
69-
<!-- Validate Edit Panel After Page Save -->
70-
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage2">
79+
<!-- Validate Stage After Page Save Mobile Viewport -->
80+
<waitForElementVisible selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="waitForButtonTextStage22"/>
81+
<!-- Validate Edit Panel After Page Save Mobile Viewport -->
82+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage22">
7183
<argument name="section" value="ButtonItemOnStage"/>
7284
<argument name="targetIndex" value="1"/>
7385
</actionGroup>
74-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonText2">
86+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonText22">
7587
<argument name="property" value="PageBuilderButtonItemText_Common"/>
7688
</actionGroup>
77-
<!-- Validate Storefront -->
89+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings22"/>
90+
<!-- Validate Storefront Desktop -->
91+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront1">
92+
<argument name="page" value="$$createCMSPage.identifier$$"/>
93+
</actionGroup>
94+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Common .value)}}" stepKey="seeButtonTextOnStorefront1"/>
95+
<!-- Validate Storefront Mobile -->
7896
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
79-
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
80-
<argument name="contentType" value="PageBuilderButtonsContentType"/>
97+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront2">
98+
<argument name="page" value="$$createCMSPage.identifier$$"/>
8199
</actionGroup>
82-
<seeElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Common .value)}}" stepKey="seeButtonTextOnStorefront"/>
100+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Common .value)}}" stepKey="seeButtonTextOnStorefront2"/>
83101
</test>
84102
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnClickOptionMenusTest.xml

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,53 @@
7171
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
7272
<actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandAdminProductSection"/>
7373
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription"/>
74+
<!-- Validate Stage After Page Save Desktop Viewport -->
75+
<seeNumberOfElements selector="{{ButtonItemOnStage.all}}" userInput="2" stepKey="see2ButtonItemsStageAfterSave1"/>
76+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton1TextStageAfterSave1"/>
77+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('2', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton2TextStageAfterSave1"/>
78+
<!-- Validate Edit Panel For Duplicate -->
79+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuForButtonItem21">
80+
<argument name="section" value="ButtonItemOnStage"/>
81+
<argument name="targetIndex" value="2"/>
82+
</actionGroup>
83+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnEditPanel1">
84+
<argument name="property" value="PageBuilderButtonItemText_Common"/>
85+
</actionGroup>
86+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanel1"/>
7487
<!-- Switch To Mobile Viewport After Save -->
7588
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewportAfterSave">
7689
<argument name="viewportButton" value="mobile"/>
7790
<argument name="viewportStage" value="mobile"/>
7891
</actionGroup>
79-
<!-- Validate Stage After Save -->
80-
<seeNumberOfElements selector="{{ButtonItemOnStage.all}}" userInput="2" stepKey="see2ButtonItemsStageAfterSave"/>
81-
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton1TextStageAfterSave"/>
82-
<seeElement selector="{{ButtonItemOnStage.buttonItemText('2', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton2TextStageAfterSave"/>
92+
<!-- Validate Stage After Save Mobile Viewport -->
93+
<seeNumberOfElements selector="{{ButtonItemOnStage.all}}" userInput="2" stepKey="see2ButtonItemsStageAfterSave2"/>
94+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton1TextStageAfterSave2"/>
95+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('2', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton2TextStageAfterSave2"/>
8396
<!-- Validate Edit Panel For Duplicate -->
84-
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuForButtonItem2">
97+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuForButtonItem22">
8598
<argument name="section" value="ButtonItemOnStage"/>
8699
<argument name="targetIndex" value="2"/>
87100
</actionGroup>
88-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnEditPanel">
101+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnEditPanel2">
89102
<argument name="property" value="PageBuilderButtonItemText_Common"/>
90103
</actionGroup>
91-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanel"/>
92-
<!-- Validate Storefront -->
104+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanel2"/>
105+
<!-- Validate Storefront Desktop -->
106+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductStorefront1">
107+
<argument name="page" value="$$createProduct.name$$.html"/>
108+
</actionGroup>
109+
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription1"/>
110+
<seeNumberOfElements selector="{{ButtonItemOnStorefront.all}}" userInput="2" stepKey="see2ButtonItemsStorefront1"/>
111+
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton1TextStorefront1"/>
112+
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('2', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton2TextStorefront1"/>
113+
<!-- Validate Storefront Mobile -->
93114
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
94-
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductStorefront">
115+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductStorefront2">
95116
<argument name="page" value="$$createProduct.name$$.html"/>
96117
</actionGroup>
97-
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription"/>
98-
<seeNumberOfElements selector="{{ButtonItemOnStorefront.all}}" userInput="2" stepKey="see2ButtonItemsStorefront"/>
99-
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton1TextStorefront"/>
100-
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('2', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton2TextStorefront"/>
118+
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription2"/>
119+
<seeNumberOfElements selector="{{ButtonItemOnStorefront.all}}" userInput="2" stepKey="see2ButtonItemsStorefront2"/>
120+
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton1TextStorefront2"/>
121+
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('2', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButton2TextStorefront2"/>
101122
</test>
102123
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditTabNameByClickingOnHeaderInStageTest.xml

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Viewport Switcher"/>
14-
<title value="Tab Configuration: Ability To Edit Tab Name Inline On the Stage By Clicking On Tab Header On Mobile Viewport"/>
14+
<title value="Mobile Viewport: Inline Edit Tab Name"/>
1515
<description value="Ability to edit Tab Name inline on the stage by clicking on tab header on mobile viewport"/>
1616
<severity value="CRITICAL"/>
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-tabs"/>
1919
<group value="pagebuilder-viewport-switcher"/>
2020
</annotations>
2121
<before>
22+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
2223
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
24+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToAPageWithPageBuilder">
25+
<argument name="CMSPage" value="$$createCMSPage$$"/>
26+
</actionGroup>
2427
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2528
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewport">
2629
<argument name="viewportButton" value="mobile"/>
@@ -29,20 +32,16 @@
2932
</before>
3033
<after>
3134
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
35+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3236
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3337
</after>
34-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
35-
<argument name="contentType" value="PageBuilderTabsContentType"/>
36-
</actionGroup>
3738
<!-- Add Tabs to Stage -->
3839
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3940
<argument name="contentType" value="PageBuilderTabsContentType"/>
4041
</actionGroup>
4142
<actionGroup ref="dragContentTypeToStage" stepKey="dragTabsIntoStage">
4243
<argument name="contentType" value="PageBuilderTabsContentType"/>
4344
</actionGroup>
44-
<waitForPageLoad stepKey="waitForOptionsPanel" time="30"/>
45-
<waitForElementVisible selector="{{TabOnStage.optionsMenuButton('1', 'edit')}}" stepKey="seeTabOptionsEdit"/>
4645
<!-- Edit tab name inline on stage -->
4746
<pressKey selector="{{TabOnStage.tabHeaderEditableTitle('1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE, \Facebook\WebDriver\WebDriverKeys::BACKSPACE, \Facebook\WebDriver\WebDriverKeys::BACKSPACE, \Facebook\WebDriver\WebDriverKeys::BACKSPACE, \Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="clearTabTitleField" />
4847
<pressKey selector="{{TabOnStage.tabHeaderEditableTitle('1')}}" userInput="{{PageBuilderTabNameRandom1.value}}" stepKey="enterTabTitle"/>
@@ -56,14 +55,31 @@
5655
</actionGroup>
5756
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
5857
<see selector="{{TabOnStage.tabHeader('1')}}" userInput="{{PageBuilderTabNameRandom1.value}}" stepKey="seeTab1TitleAdminAgain"/>
59-
<!-- Verify in storefront -->
6058
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6159
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
60+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
61+
<!-- Validate Stage After Page Save Desktop Viewport -->
62+
<waitForElementVisible selector="{{TabOnStage.tabHeader('1')}}" stepKey="waitForTab1TitleAdmin1"/>
63+
<!-- Switch To Mobile Viewport After Save -->
64+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewportAfterSave">
65+
<argument name="viewportButton" value="mobile"/>
66+
<argument name="viewportStage" value="mobile"/>
67+
</actionGroup>
68+
<!-- Validate Stage After Page Save Mobile Viewport -->
69+
<waitForElementVisible selector="{{TabOnStage.tabHeader('1')}}" stepKey="waitForTab1TitleAdmin2"/>
70+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenAfterSave"/>
71+
<!-- Validate Storefront Desktop -->
72+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront1">
73+
<argument name="page" value="$$createCMSPage.identifier$$"/>
74+
</actionGroup>
75+
<waitForElementVisible selector="{{TabOnStorefront.tabHeader('1')}}" stepKey="seeTabHeader1Storefront1"/>
76+
<see selector="{{TabOnStorefront.tabHeader('1')}}" userInput="{{PageBuilderTabNameRandom1.value}}" stepKey="seeTab1TitleStorefront1"/>
77+
<!-- Validate Storefront Mobile -->
6278
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
63-
<!-- User sees Tab 1 with custom tab name on Storefront -->
64-
<amOnPage url="{{PageBuilderTabsContentType.name}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnPageBuilderPage"/>
65-
<waitForPageLoad stepKey="waitForStoreFrontPageLoad" time="30"/>
66-
<waitForElementVisible selector="{{TabOnStorefront.tabHeader('1')}}" stepKey="seeTabHeader1Storefront"/>
67-
<see selector="{{TabOnStorefront.tabHeader('1')}}" userInput="{{PageBuilderTabNameRandom1.value}}" stepKey="seeTab1TitleStorefront"/>
79+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront2">
80+
<argument name="page" value="$$createCMSPage.identifier$$"/>
81+
</actionGroup>
82+
<waitForElementVisible selector="{{TabOnStorefront.tabHeader('1')}}" stepKey="seeTabHeader1Storefront2"/>
83+
<see selector="{{TabOnStorefront.tabHeader('1')}}" userInput="{{PageBuilderTabNameRandom1.value}}" stepKey="seeTab1TitleStorefront2"/>
6884
</test>
6985
</tests>

0 commit comments

Comments
 (0)