Skip to content

Commit 25edc69

Browse files
krissyhiserotekrissyhiserote
committed
MAGETWO-91974: [Testing] Create/Update Automated Tests
- fix minor issues name changes, remove validation of edit panel, and assertGreaterThan
1 parent 60f8516 commit 25edc69

File tree

2 files changed

+30
-62
lines changed

2 files changed

+30
-62
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@
8585
<waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
8686
<executeJS function="{{buttonItemPage.xCoordinate(secondButtonIndex)}}" stepKey="xCoordinate2"/>
8787
<executeJS function="{{buttonItemPage.yCoordinate(secondButtonIndex)}}" stepKey="yCoordinate2"/>
88-
<assertGreaterThan expected="$xCoordinate1" actual="$xCoordinate2" stepKey="checkXCoordinates"/>
88+
<assertGreaterThan stepKey="checkXCoordinates">
89+
<expectedResult type="variable">xCoordinate1</expectedResult>
90+
<actualResult type="variable">xCoordinate2</actualResult>
91+
</assertGreaterThan>
8992
<assertEquals stepKey="checkYCoordinates">
9093
<expectedResult type="variable">yCoordinate1</expectedResult>
9194
<actualResult type="variable">yCoordinate2</actualResult>
@@ -107,8 +110,14 @@
107110
<waitForElementVisible selector="{{buttonItemPage.base(secondButtonIndex)}}" stepKey="waitForButton2"/>
108111
<executeJS function="{{buttonItemPage.xCoordinate(secondButtonIndex)}}" stepKey="xCoordinate2"/>
109112
<executeJS function="{{buttonItemPage.yCoordinate(secondButtonIndex)}}" stepKey="yCoordinate2"/>
110-
<assertGreaterThan expected="$xCoordinate1" actual="$xCoordinate2" stepKey="checkXCoordinates"/>
111-
<assertGreaterThan expected="$yCoordinate1" actual="$yCoordinate2" stepKey="checkYCoordinates"/>
113+
<assertGreaterThan stepKey="checkXCoordinates">
114+
<expectedResult type="variable">xCoordinate1</expectedResult>
115+
<actualResult type="variable">xCoordinate2</actualResult>
116+
</assertGreaterThan>
117+
<assertGreaterThan stepKey="checkYCoordinates">
118+
<expectedResult type="variable">yCoordinate1</expectedResult>
119+
<actualResult type="variable">yCoordinate2</actualResult>
120+
</assertGreaterThan>
112121
</actionGroup>
113122
<actionGroup name="validateButtonGroupStackedAppearance">
114123
<arguments>
@@ -130,6 +139,9 @@
130139
<expectedResult type="variable">xCoordinate1</expectedResult>
131140
<actualResult type="variable">xCoordinate2</actualResult>
132141
</assertEquals>
133-
<assertGreaterThan expected="$yCoordinate1" actual="$yCoordinate2" stepKey="checkYCoordinates"/>
142+
<assertGreaterThan stepKey="checkYCoordinates">
143+
<expectedResult type="variable">yCoordinate1</expectedResult>
144+
<actualResult type="variable">yCoordinate2</actualResult>
145+
</assertGreaterThan>
134146
</actionGroup>
135147
</actionGroups>

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

Lines changed: 14 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@
714714
</actionGroup>
715715
<!-- Select And Validate Inline Appearance -->
716716
<comment userInput="Select And Validate Inline Appearances" stepKey="CommentSelectAndValidateInlineAppearance"/>
717-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
717+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
718718
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
719719
</actionGroup>
720720
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected">
@@ -801,7 +801,7 @@
801801
</actionGroup>
802802
<!-- Select And Validate Stacked Appearance -->
803803
<comment userInput="Select And Validate Stacked Appearances" stepKey="CommentSelectAndValidateStackedAppearance"/>
804-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
804+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
805805
<argument name="property" value="PageBuilderAppearancePropertyStacked"/>
806806
</actionGroup>
807807
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected">
@@ -870,12 +870,9 @@
870870
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
871871
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
872872
</actionGroup>
873-
<!-- Select And Validate Inline Appearance -->
874-
<comment userInput="Select And Validate Inline Appearance" stepKey="CommentSelectAndValidateInlineAppearance"/>
875-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
876-
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
877-
</actionGroup>
878-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected">
873+
<!-- Select Inline Appearance -->
874+
<comment userInput="Select Inline Appearance" stepKey="CommentSelectInlineAppearance"/>
875+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
879876
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
880877
</actionGroup>
881878
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
@@ -894,14 +891,6 @@
894891
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
895892
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
896893
</actionGroup>
897-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
898-
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
899-
</actionGroup>
900-
<!-- Validate Edit Panel After Save -->
901-
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
902-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected2">
903-
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
904-
</actionGroup>
905894
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
906895
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
907896
</actionGroup>
@@ -942,12 +931,9 @@
942931
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
943932
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
944933
</actionGroup>
945-
<!-- Select And Validate Stacked Appearance -->
946-
<comment userInput="Select And Validate Stacked Appearance" stepKey="CommentSelectAndValidateStackedAppearance"/>
947-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
948-
<argument name="property" value="PageBuilderAppearancePropertyStacked"/>
949-
</actionGroup>
950-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected">
934+
<!-- Select Stacked Appearance -->
935+
<comment userInput="Select Stacked Appearance" stepKey="CommentSelectStackedAppearance"/>
936+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
951937
<argument name="property" value="PageBuilderAppearancePropertyStacked"/>
952938
</actionGroup>
953939
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
@@ -966,14 +952,6 @@
966952
<argument name="buttonGroupPage" value="ButtonGroupOnStage"/>
967953
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
968954
</actionGroup>
969-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
970-
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
971-
</actionGroup>
972-
<!-- Validate Edit Panel After Save -->
973-
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
974-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected2">
975-
<argument name="property" value="PageBuilderAppearancePropertyStacked"/>
976-
</actionGroup>
977955
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
978956
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
979957
</actionGroup>
@@ -1014,12 +992,9 @@
1014992
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
1015993
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
1016994
</actionGroup>
1017-
<!-- Select And Validate Inline Appearance -->
1018-
<comment userInput="Select And Validate Inline Appearance" stepKey="CommentSelectAndValidateInlineAppearance"/>
1019-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1020-
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
1021-
</actionGroup>
1022-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected">
995+
<!-- Select Inline Appearance -->
996+
<comment userInput="Select Inline Appearance" stepKey="CommentSelectInlineAppearance"/>
997+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
1023998
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
1024999
</actionGroup>
10251000
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
@@ -1115,14 +1090,6 @@
11151090
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
11161091
<argument name="secondButtonIndex" value="10"/>
11171092
</actionGroup>
1118-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
1119-
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
1120-
</actionGroup>
1121-
<!-- Validate Edit Panel After Save -->
1122-
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
1123-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected2">
1124-
<argument name="property" value="PageBuilderAppearancePropertyInline"/>
1125-
</actionGroup>
11261093
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
11271094
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
11281095
</actionGroup>
@@ -1171,12 +1138,9 @@
11711138
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
11721139
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
11731140
</actionGroup>
1174-
<!-- Select And Validate Stacked Appearance -->
1175-
<comment userInput="Select And Validate Stacked Appearance" stepKey="CommentSelectAndValidateStackedAppearance"/>
1176-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1177-
<argument name="property" value="PageBuilderAppearancePropertyStacked"/>
1178-
</actionGroup>
1179-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected">
1141+
<!-- Select Stacked Appearance -->
1142+
<comment userInput="Select Stacked Appearance" stepKey="CommentSelectStackedAppearance"/>
1143+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
11801144
<argument name="property" value="PageBuilderAppearancePropertyStacked"/>
11811145
</actionGroup>
11821146
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
@@ -1237,14 +1201,6 @@
12371201
<argument name="firstButtonIndex" value="2"/>
12381202
<argument name="secondButtonIndex" value="3"/>
12391203
</actionGroup>
1240-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
1241-
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
1242-
</actionGroup>
1243-
<!-- Validate Edit Panel After Save -->
1244-
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
1245-
<actionGroup ref="validateVisualSelectOptionIsSelected" stepKey="seeAppearanceIsSelected2">
1246-
<argument name="property" value="PageBuilderAppearancePropertyStacked"/>
1247-
</actionGroup>
12481204
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
12491205
<argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
12501206
</actionGroup>

0 commit comments

Comments
 (0)