Skip to content

Commit 71041a9

Browse files
dhaeckerdhaecker
committed
MC-3020: Stabilize PR
- Fixing column resize tests that dont setup correctly
1 parent 9e77033 commit 71041a9

File tree

2 files changed

+61
-78
lines changed

2 files changed

+61
-78
lines changed

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,67 @@
7777
<actualResult type="string">{{PageBuilderGridSize.defaultGridSize}}</actualResult>
7878
</assertEquals>
7979
</test>
80+
<test name="ColumnValidateOddDefaultGridSizeIsSplitCorrectly">
81+
<annotations>
82+
<features value="PageBuilder"/>
83+
<stories value="Column"/>
84+
<title value="Grid Size: Verify that the initial two column split is correct when the default grid size is odd."/>
85+
<description value="Verify that the initial two column split is correct when the default grid size is odd."/>
86+
<severity value="CRITICAL"/>
87+
<useCaseId value="MC-950"/>
88+
<testCaseId value="MC-2309"/>
89+
<group value="pagebuilder"/>
90+
<group value="pagebuilder-column"/>
91+
<group value="pagebuilder-columnGridSize"/>
92+
</annotations>
93+
<before>
94+
<magentoCLI command="config:set cms/pagebuilder/column_grid_default 5" stepKey="setDefaultGridSize"/>
95+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
96+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
97+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
98+
</before>
99+
<after>
100+
<magentoCLI command="config:set cms/pagebuilder/column_grid_default 12" stepKey="setDefaultGridSize"/>
101+
<actionGroup ref="logout" stepKey="logout"/>
102+
</after>
103+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
104+
<argument name="contentType" value="PageBuilderColumnContentType"/>
105+
</actionGroup>
106+
<waitForElementVisible selector="{{PageBuilderColumnSection.displayLabel('1', '3/5')}}" stepKey="verifyFirstColumn"/>
107+
<waitForElementVisible selector="{{PageBuilderColumnSection.displayLabel('2', '2/5')}}" stepKey="verifySecondColumn"/>
108+
</test>
109+
<test name="ColumnValidateColumnGridTooltipMessage">
110+
<annotations>
111+
<features value="PageBuilder"/>
112+
<stories value="Column"/>
113+
<title value="Grid Size: Column grid panel tooltip updates with max column size."/>
114+
<description value="Verify that the tooltip for grid size updates to reflect the max column size."/>
115+
<severity value="CRITICAL"/>
116+
<useCaseId value="MC-950"/>
117+
<testCaseId value="MC-2313"/>
118+
<group value="pagebuilder"/>
119+
<group value="pagebuilder-column"/>
120+
<group value="pagebuilder-columnGridSize"/>
121+
</annotations>
122+
<before>
123+
<magentoCLI command="config:set cms/pagebuilder/column_grid_default 3" stepKey="setDefaultGridSize"/>
124+
<magentoCLI command="config:set cms/pagebuilder/column_grid_max 5" stepKey="setMaxGridSize"/>
125+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
126+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
127+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
128+
</before>
129+
<after>
130+
<magentoCLI command="config:set cms/pagebuilder/column_grid_default 12" stepKey="setDefaultGridSize"/>
131+
<magentoCLI command="config:set cms/pagebuilder/column_grid_max 16" stepKey="setMaxGridSize"/>
132+
<actionGroup ref="logout" stepKey="logout"/>
133+
</after>
134+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
135+
<argument name="contentType" value="PageBuilderColumnContentType"/>
136+
</actionGroup>
137+
<actionGroup ref="openGridSizeForm" stepKey="openGridSizeForm" />
138+
<click selector="{{PageBuilderColumnSection.gridSizeTooltip('1')}}" stepKey="clickWithinPanel"/>
139+
<waitForElementVisible selector="{{PageBuilderColumnSection.gridSizeTooltipWithMax('1', PageBuilderGridSize.gridSize_5)}}" stepKey="verifyTooltip"/>
140+
</test>
80141
<test name="SetDefaultGridSize14">
81142
<annotations>
82143
<features value="PageBuilder"/>

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

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -155,84 +155,6 @@
155155
<actionGroup ref="saveStoreConfiguration" stepKey="saveStoreConfiguration6"/>
156156
<see selector="{{ContentManagementSection.StoreConfigurationPageSuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage3"/>
157157
</test>
158-
<test name="StoreConfigurationValidateOddDefaultGridSizeIsSplitCorrectly">
159-
<annotations>
160-
<features value="PageBuilder"/>
161-
<stories value="Store Configuration - Column Grid Size"/>
162-
<title value="Verify that the initial two column split is correct when the default grid size is odd."/>
163-
<description value="Verify that the initial two column split is correct when the default grid size is odd."/>
164-
<severity value="CRITICAL"/>
165-
<useCaseId value="MC-950"/>
166-
<testCaseId value="MC-2309"/>
167-
<group value="pagebuilder"/>
168-
<group value="pagebuilder-column"/>
169-
<group value="pagebuilder-columnGridSizeConfig"/>
170-
</annotations>
171-
<before>
172-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
173-
<actionGroup ref="navigateToAdminContentManagementPage" stepKey="navigateToAdminContentManagementPage"/>
174-
<conditionalClick stepKey="expandAdvancedContentTools" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/>
175-
<conditionalClick stepKey="uncheckUseSystemValueDefault" selector="{{ContentManagementSection.UseSystem('column_grid_default')}}" dependentSelector="{{ContentManagementSection.UseSystemChecked('column_grid_default')}}" visible="true"/>
176-
<!-- Enter Odd Default Grid Size -->
177-
<comment userInput="Enter Odd Default Grid Size" stepKey="comment1"/>
178-
<actionGroup ref="updateDefaultGridSizeConfig" stepKey="enterValidDefaultGridSize">
179-
<argument name="gridSize" value="{{PageBuilderGridSize.gridSize_5}}"/>
180-
</actionGroup>
181-
<actionGroup ref="saveStoreConfiguration" stepKey="saveStoreConfiguration"/>
182-
<see selector="{{ContentManagementSection.StoreConfigurationPageSuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage1"/>
183-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
184-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
185-
</before>
186-
<after>
187-
<magentoCLI command="config:set cms/pagebuilder/column_grid_default 12" stepKey="setDefaultGridSize"/>
188-
<magentoCLI command="config:set cms/pagebuilder/column_grid_max 16" stepKey="setMaxGridSize"/>
189-
<actionGroup ref="logout" stepKey="logout"/>
190-
</after>
191-
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
192-
<argument name="contentType" value="PageBuilderColumnContentType"/>
193-
</actionGroup>
194-
<waitForElementVisible selector="{{PageBuilderColumnSection.displayLabel('1', '3/5')}}" stepKey="verifyFirstColumn"/>
195-
<waitForElementVisible selector="{{PageBuilderColumnSection.displayLabel('2', '2/5')}}" stepKey="verifySecondColumn"/>
196-
</test>
197-
<test name="StoreConfigurationValidateColumnGridTooltipMessage">
198-
<annotations>
199-
<features value="PageBuilder"/>
200-
<stories value="Store Configuration - Column Grid Size"/>
201-
<title value="Column grid panel tooltip updates with max column size."/>
202-
<description value="Verify that the tooltip for grid size updates to reflect the max column size."/>
203-
<severity value="CRITICAL"/>
204-
<useCaseId value="MC-950"/>
205-
<testCaseId value="MC-2313"/>
206-
<group value="pagebuilder"/>
207-
<group value="pagebuilder-column"/>
208-
<group value="pagebuilder-columnGridSizeConfig"/>
209-
</annotations>
210-
<before>
211-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
212-
<actionGroup ref="navigateToAdminContentManagementPage" stepKey="navigateToAdminContentManagementPage"/>
213-
<conditionalClick stepKey="expandAdvancedContentTools" selector="{{ContentManagementSection.PageBuilderOptions}}" dependentSelector="{{ContentManagementSection.CheckIfPageBuilderTabExpanded}}" visible="true"/>
214-
<conditionalClick stepKey="uncheckUseSystemValue" selector="{{ContentManagementSection.UseSystem('column_grid_max')}}" dependentSelector="{{ContentManagementSection.UseSystemChecked('column_grid_max')}}" visible="true"/>
215-
<comment userInput="Change Maximum Grid Size to 5" stepKey="comment1"/>
216-
<actionGroup ref="updateMaxGridSizeConfig" stepKey="enterValidMaxGridSize">
217-
<argument name="gridSize" value="{{PageBuilderGridSize.gridSize_5}}"/>
218-
</actionGroup>
219-
<actionGroup ref="saveStoreConfiguration" stepKey="saveStoreConfiguration"/>
220-
<see selector="{{ContentManagementSection.StoreConfigurationPageSuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage1"/>
221-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
222-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
223-
</before>
224-
<after>
225-
<magentoCLI command="config:set cms/pagebuilder/column_grid_default 12" stepKey="setDefaultGridSize"/>
226-
<magentoCLI command="config:set cms/pagebuilder/column_grid_max 16" stepKey="setMaxGridSize"/>
227-
<actionGroup ref="logout" stepKey="logout"/>
228-
</after>
229-
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
230-
<argument name="contentType" value="PageBuilderColumnContentType"/>
231-
</actionGroup>
232-
<actionGroup ref="openGridSizeForm" stepKey="openGridSizeForm" />
233-
<click selector="{{PageBuilderColumnSection.gridSizeTooltip('1')}}" stepKey="clickWithinPanel"/>
234-
<waitForElementVisible selector="{{PageBuilderColumnSection.gridSizeTooltipWithMax('1', PageBuilderGridSize.gridSize_5)}}" stepKey="verifyTooltip"/>
235-
</test>
236158
<test name="StoreConfigurationDefaultColumnGridSizeFieldAppearance">
237159
<annotations>
238160
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)