Skip to content

Commit 0bfa697

Browse files
krissyhiserotekrissyhiserote
committed
MAGETWO-91974: [Testing] Create/Update Automated Tests
- add inline appearance test with button wrap
1 parent b84a4a9 commit 0bfa697

File tree

4 files changed

+182
-16
lines changed

4 files changed

+182
-16
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/ActionGroup/ButtonActionGroup.xml

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,35 +74,58 @@
7474
<argument name="buttonGroupPage"/>
7575
<argument name="buttonItemPage"/>
7676
<argument name="index" defaultValue="1" type="string"/>
77+
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
78+
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
7779
</arguments>
7880
<waitForElementVisible selector="{{buttonGroupPage.base(index)}}" stepKey="waitForButtonGroup"/>
7981
<seeElementInDOM selector="{{buttonGroupPage.appearance(index, PageBuilderAppearancePropertyInline.value)}}" stepKey="seeButtonAppearance"/>
80-
<waitForElementVisible selector="{{buttonItemPage.base('1')}}" stepKey="waitForButton1"/>
81-
<executeJS function="{{buttonItemPage.xCoordinate('0')}}" stepKey="xCoordinate1"/>
82-
<executeJS function="{{buttonItemPage.yCoordinate('0')}}" stepKey="yCoordinate1"/>
83-
<waitForElementVisible selector="{{buttonItemPage.base('2')}}" stepKey="waitForButton2"/>
84-
<executeJS function="{{buttonItemPage.xCoordinate('1')}}" stepKey="xCoordinate2"/>
85-
<executeJS function="{{buttonItemPage.yCoordinate('1')}}" stepKey="yCoordinate2"/>
82+
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
83+
<executeJS function="{{buttonItemPage.xCoordinate(firstButtonIndex)}}" stepKey="xCoordinate1"/>
84+
<executeJS function="{{buttonItemPage.yCoordinate(firstButtonIndex)}}" stepKey="yCoordinate1"/>
85+
<waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
86+
<executeJS function="{{buttonItemPage.xCoordinate(secondButtonIndex)}}" stepKey="xCoordinate2"/>
87+
<executeJS function="{{buttonItemPage.yCoordinate(secondButtonIndex)}}" stepKey="yCoordinate2"/>
8688
<assertGreaterThan expected="$xCoordinate1" actual="$xCoordinate2" stepKey="checkXCoordinates"/>
8789
<assertEquals stepKey="checkYCoordinates">
8890
<expectedResult type="variable">yCoordinate1</expectedResult>
8991
<actualResult type="variable">yCoordinate2</actualResult>
9092
</assertEquals>
9193
</actionGroup>
94+
<actionGroup name="validateButtonGroupInlineAppearanceWraps">
95+
<arguments>
96+
<argument name="buttonGroupPage"/>
97+
<argument name="buttonItemPage"/>
98+
<argument name="index" defaultValue="1" type="string"/>
99+
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
100+
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
101+
</arguments>
102+
<waitForElementVisible selector="{{buttonGroupPage.base(index)}}" stepKey="waitForButtonGroup"/>
103+
<seeElementInDOM selector="{{buttonGroupPage.appearance(index, PageBuilderAppearancePropertyInline.value)}}" stepKey="seeButtonAppearance"/>
104+
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
105+
<executeJS function="{{buttonItemPage.xCoordinate(firstButtonIndex)}}" stepKey="xCoordinate1"/>
106+
<executeJS function="{{buttonItemPage.yCoordinate(firstButtonIndex)}}" stepKey="yCoordinate1"/>
107+
<waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
108+
<executeJS function="{{buttonItemPage.xCoordinate(secondButtonIndex)}}" stepKey="xCoordinate2"/>
109+
<executeJS function="{{buttonItemPage.yCoordinate(secondButtonIndex)}}" stepKey="yCoordinate2"/>
110+
<assertGreaterThan expected="$xCoordinate1" actual="$xCoordinate2" stepKey="checkXCoordinates"/>
111+
<assertGreaterThan expected="$yCoordinate1" actual="$yCoordinate2" stepKey="checkYCoordinates"/>
112+
</actionGroup>
92113
<actionGroup name="validateButtonGroupStackedAppearance">
93114
<arguments>
94115
<argument name="buttonGroupPage"/>
95116
<argument name="buttonItemPage"/>
96117
<argument name="index" defaultValue="1" type="string"/>
118+
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
119+
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
97120
</arguments>
98121
<waitForElementVisible selector="{{buttonGroupPage.base(index)}}" stepKey="waitForButtonGroup"/>
99122
<seeElementInDOM selector="{{buttonGroupPage.appearance(index, PageBuilderAppearancePropertyStacked.value)}}" stepKey="seeButtonAppearance"/>
100-
<waitForElementVisible selector="{{buttonItemPage.base('1')}}" stepKey="waitForButton1"/>
101-
<executeJS function="{{buttonItemPage.xCoordinate('0')}}" stepKey="xCoordinate1"/>
102-
<executeJS function="{{buttonItemPage.yCoordinate('0')}}" stepKey="yCoordinate1"/>
103-
<waitForElementVisible selector="{{buttonItemPage.base('2')}}" stepKey="waitForButton2"/>
104-
<executeJS function="{{buttonItemPage.xCoordinate('1')}}" stepKey="xCoordinate2"/>
105-
<executeJS function="{{buttonItemPage.yCoordinate('1')}}" stepKey="yCoordinate2"/>
123+
<waitForElementVisible selector="{{buttonItemPage.base(firstButtonIndex)}}" stepKey="waitForButton1"/>
124+
<executeJS function="{{buttonItemPage.xCoordinate(firstButtonIndex)}}" stepKey="xCoordinate1"/>
125+
<executeJS function="{{buttonItemPage.yCoordinate(firstButtonIndex)}}" stepKey="yCoordinate1"/>
126+
<waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
127+
<executeJS function="{{buttonItemPage.xCoordinate(secondButtonIndex)}}" stepKey="xCoordinate2"/>
128+
<executeJS function="{{buttonItemPage.yCoordinate(secondButtonIndex)}}" stepKey="yCoordinate2"/>
106129
<assertEquals stepKey="checkXCoordinates">
107130
<expectedResult type="variable">xCoordinate1</expectedResult>
108131
<actualResult type="variable">xCoordinate2</actualResult>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/ButtonData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
<data key="fieldName">button_text</data>
7070
<data key="value">Third</data>
7171
</entity>
72+
<entity name="PageBuilderButtonItemText_Last" type="pagebuilder_button_item_text_property">
73+
<data key="name">Button Text</data>
74+
<data key="section">content</data>
75+
<data key="fieldName">button_text</data>
76+
<data key="value">Last</data>
77+
</entity>
7278
<!-- Button Type -->
7379
<entity name="PageBuilderButtonItemType_Primary" type="pagebuilder_button_item_type_property">
7480
<data key="name">Button Type</data>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Section/PageBuilderButtonsSection.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]" parameterized="true"/>
4949
<element name="emptyButtonItemElement" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]//span[contains(@class,'placeholder-text') and not(text())]" parameterized="true"/>
5050
<element name="editableButtonItemElement" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]//span[contains(@contenteditable,'true')]" parameterized="true"/>
51-
<element name="xCoordinate" type="text" selector="return document.querySelectorAll('.pagebuilder-button-item')[{{arg1}}].getBoundingClientRect().x" parameterized="true"/>
52-
<element name="yCoordinate" type="text" selector="return document.querySelectorAll('.pagebuilder-button-item')[{{arg1}}].getBoundingClientRect().y" parameterized="true"/>
51+
<element name="xCoordinate" type="text" selector="return document.querySelectorAll('.pagebuilder-button-item')[{{arg1}}-1].getBoundingClientRect().x" parameterized="true"/>
52+
<element name="yCoordinate" type="text" selector="return document.querySelectorAll('.pagebuilder-button-item')[{{arg1}}-1].getBoundingClientRect().y" parameterized="true"/>
5353
<!-- Content Configuration -->
5454
<element name="buttonItemText" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]//span[contains(.,'{{arg2}}')]" parameterized="true"/>
5555
<element name="buttonItemType" type="button" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[@class='{{arg2}}']" parameterized="true"/>
@@ -70,8 +70,8 @@
7070
<element name="allButtons" type="button" selector="//div[@data-role='button-item']"/>
7171
<element name="base" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]" parameterized="true"/>
7272
<element name="emptyButtonItemElement" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a//span[not(text())]" parameterized="true"/>
73-
<element name="xCoordinate" type="text" selector="return document.querySelectorAll('div[data-role=\'button-item\']')[{{arg1}}].getBoundingClientRect().x" parameterized="true"/>
74-
<element name="yCoordinate" type="text" selector="return document.querySelectorAll('div[data-role=\'button-item\']')[{{arg1}}].getBoundingClientRect().y" parameterized="true"/>
73+
<element name="xCoordinate" type="text" selector="return document.querySelectorAll('div[data-role=\'button-item\']')[{{arg1}}-1].getBoundingClientRect().x" parameterized="true"/>
74+
<element name="yCoordinate" type="text" selector="return document.querySelectorAll('div[data-role=\'button-item\']')[{{arg1}}-1].getBoundingClientRect().y" parameterized="true"/>
7575
<!-- Content Configuration -->
7676
<element name="buttonItemText" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a//span[contains(.,'{{arg2}}')]" parameterized="true"/>
7777
<element name="buttonItemType" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@class='{{arg2}}']" parameterized="true"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderButtonGroupTests.xml

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,143 @@
631631
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
632632
</actionGroup>
633633
</test>
634+
<test name="ButtonGroupValidateInlineAppearance">
635+
<annotations>
636+
<features value="PageBuilder"/>
637+
<stories value="Buttons"/>
638+
<title value="Button Group - Validate Inline Appearance"/>
639+
<description value="Validate the Inline Appearance in the Configuration form, on Stage and Storefront for a Button group."/>
640+
<severity value="CRITICAL"/>
641+
<testCaseId value="MAGETWO-92347"/>
642+
<useCaseId value="MAGETWO-66361"/>
643+
<group value="pagebuilder"/>
644+
<group value="pagebuilder-buttons"/>
645+
<group value="pagebuilder-buttonGroup"/>
646+
</annotations>
647+
<before>
648+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
649+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
650+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
651+
</before>
652+
<after>
653+
<actionGroup ref="logout" stepKey="logout"/>
654+
</after>
655+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
656+
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
657+
</actionGroup>
658+
<actionGroup ref="dragContentBlockToStage" stepKey="dragContentBlockToStage">
659+
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
660+
</actionGroup>
661+
<!-- Add Enough Buttons To Wrap -->
662+
<comment userInput="Add Enough Buttons To Wrap" stepKey="commentAddEnoughButtonsToWrap"/>
663+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton1">
664+
<argument name="text" value="PageBuilderButtonItemText_First"/>
665+
<argument name="index" value="1"/>
666+
</actionGroup>
667+
<actionGroup ref="addButton" stepKey="addButton2"/>
668+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton2">
669+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
670+
<argument name="index" value="2"/>
671+
</actionGroup>
672+
<actionGroup ref="addButton" stepKey="addButton3"/>
673+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton3">
674+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
675+
<argument name="index" value="3"/>
676+
</actionGroup>
677+
<actionGroup ref="addButton" stepKey="addButton4"/>
678+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton4">
679+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
680+
<argument name="index" value="4"/>
681+
</actionGroup>
682+
<actionGroup ref="addButton" stepKey="addButton5"/>
683+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton5">
684+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
685+
<argument name="index" value="5"/>
686+
</actionGroup>
687+
<actionGroup ref="addButton" stepKey="addButton6"/>
688+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton6">
689+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
690+
<argument name="index" value="6"/>
691+
</actionGroup>
692+
<actionGroup ref="addButton" stepKey="addButton7"/>
693+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton7">
694+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
695+
<argument name="index" value="7"/>
696+
</actionGroup>
697+
<actionGroup ref="addButton" stepKey="addButton8"/>
698+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton8">
699+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
700+
<argument name="index" value="8"/>
701+
</actionGroup>
702+
<actionGroup ref="addButton" stepKey="addButton9"/>
703+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton9">
704+
<argument name="text" value="PageBuilderButtonItemText_Common"/>
705+
<argument name="index" value="9"/>
706+
</actionGroup>
707+
<actionGroup ref="addButton" stepKey="addButton10"/>
708+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton10">
709+
<argument name="text" value="PageBuilderButtonItemText_Last"/>
710+
<argument name="index" value="10"/>
711+
</actionGroup>
712+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
713+
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
714+
</actionGroup>
715+
<!-- Select And Validate Inline Appearance -->
716+
<comment userInput="Select And Validate Inline Appearances" stepKey="CommentSelectAndValidateInlineAppearance"/>
717+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
718+
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
719+
</actionGroup>
720+
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected">
721+
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
722+
</actionGroup>
723+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
724+
<!-- Validate Stage -->
725+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
726+
<actionGroup ref="validateButtonGroupInlineAppearance" stepKey="seeAppearanceOnStage">
727+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
728+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
729+
</actionGroup>
730+
<actionGroup ref="validateButtonGroupInlineAppearanceWraps" stepKey="seeAppearanceWrapsOnStage">
731+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
732+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
733+
<argument name="secondButtonIndex" value="10"/>
734+
</actionGroup>
735+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
736+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
737+
<!-- Validate Stage After Save -->
738+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
739+
<actionGroup ref="validateButtonGroupInlineAppearance" stepKey="seeAppearanceOnStage2">
740+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
741+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
742+
</actionGroup>
743+
<actionGroup ref="validateButtonGroupInlineAppearanceWraps" stepKey="seeAppearanceWrapsOnStage2">
744+
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
745+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
746+
<argument name="secondButtonIndex" value="10"/>
747+
</actionGroup>
748+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
749+
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
750+
</actionGroup>
751+
<!-- Validate Edit Panel After Save -->
752+
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
753+
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected2">
754+
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
755+
</actionGroup>
756+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
757+
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
758+
</actionGroup>
759+
<!-- Validate Storefront -->
760+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
761+
<actionGroup ref="validateButtonGroupInlineAppearance" stepKey="seeAppearanceOnStorefront">
762+
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
763+
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
764+
</actionGroup>
765+
<actionGroup ref="validateButtonGroupInlineAppearanceWraps" stepKey="seeAppearanceWrapsOnStorefront">
766+
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
767+
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
768+
<argument name="secondButtonIndex" value="10"/>
769+
</actionGroup>
770+
</test>
634771
<test name="ButtonGroupValidateStackedAppearance">
635772
<annotations>
636773
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)