Skip to content

Commit 67b00de

Browse files
owlpelletzowlpelletz
committed
MAGETWO-90464: Stabilize builds
- modified tabs tests to work with suite
1 parent 2a2e633 commit 67b00de

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
26-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder" after="enableWYSIWYG"/>
2725
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2826
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2927
</before>
3028
<after>
31-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
3229
<actionGroup ref="logout" stepKey="logout"/>
3330
</after>
3431
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

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

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,31 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder"/>
2625
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2726
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2827
</before>
2928
<after>
30-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
31-
<amOnPage url="admin/admin/auth/logout" stepKey="amOnLogoutPage"/>
32-
<waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
29+
<actionGroup ref="logout" stepKey="logout"/>
3330
</after>
3431
<comment userInput="Given I have added Tabs container with one Tab to the stage and save" stepKey="AC1"/>
3532
<!-- Set the page title, as we'll be saving the page -->
3633
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle1">
3734
<argument name="contentBlockType" value="PageBuilderTabsContentBlock"/>
3835
</actionGroup>
39-
4036
<fillField selector="{{PageBuilderActionsSection.searchPanel}}" userInput="tabs" stepKey="fillSearch"/>
4137
<see userInput="Tabs" selector="{{PageBuilderActionsSection.searchResults}}" stepKey="validateSearchResults"/>
4238
<actionGroup ref="dragContentBlockToStage" stepKey="dragContentBlockToStage">
4339
<argument name="contentBlockType" value="PageBuilderTabsContentBlock"/>
4440
</actionGroup>
45-
4641
<waitForPageLoad stepKey="waitForTabsToLoad"/>
4742
<waitForElementVisible selector="{{TabOnStage.tabContent('1')}}" stepKey="waitForFirstTabContent"/>
4843
<waitForElementVisible selector="{{TabOnStage.tabHeader('1')}}" stepKey="waitForFirstTabHeader"/>
4944
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
5045
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
51-
5246
<comment userInput="When I view options menu for single Tab" stepKey="AC2"/>
5347
<waitForElementVisible time="10" selector="{{TabOnStage.tabHeader('1')}}" stepKey="waitForContentBlockInStageVisible" />
5448
<click stepKey="clickTabTitle" selector="{{TabOnStage.tabHeader('1')}}"/>
5549
<waitForElementVisible selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit"/>
56-
5750
<!-- Verify Remove option is disabled -->
5851
<comment userInput="User sees that removing last tab from the Tabs content block is disabled" stepKey="AC3"/>
5952
<seeElement selector="{{TabOnStage.tabOptionsRemoveDisabled}}" stepKey="seeTabRemoveOptionDisabled"/>
@@ -63,7 +56,6 @@
6356
<argument name="contentBlockType" value="PageBuilderTabsContentBlock"/>
6457
</actionGroup>
6558
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
66-
6759
<comment userInput="No Tabs shown on the stage after save nor on the storefront" stepKey="AC5"/>
6860
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
6961
<dontSeeElement selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderTabsContentBlock.role)}}" stepKey="dontSeeContentBlockInStage"/>
@@ -86,12 +78,10 @@
8678
</annotations>
8779
<before>
8880
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
89-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder"/>
9081
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
9182
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
9283
</before>
9384
<after>
94-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
9585
<actionGroup ref="logout" stepKey="logout"/>
9686
</after>
9787
<comment userInput="Given I have added Tabs content block to the stage with a second Tab in default state" stepKey="AC1"/>
@@ -114,19 +104,16 @@
114104
<actionGroup ref="addTab" stepKey="addSecondTab"/>
115105
<waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
116106
<waitForElementVisible selector="{{TabOnStage.tabHeader('2')}}" stepKey="confirmSecondTab"/>
117-
118107
<comment userInput="When I delete second default state Tab from the stage" stepKey="AC2"/>
119108
<waitForElementVisible time="10" selector="{{TabOnStage.tabHeader('2')}}" stepKey="waitForContentBlockInStageVisible" />
120109
<click stepKey="clickTabTitle" selector="{{TabOnStage.tabHeader('2')}}"/>
121110
<waitForElementVisible selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit"/>
122111
<!-- Remove second tab -->
123112
<click selector="{{TabOnStage.tabOptionsRemove}}" stepKey="clickRemoveOption"/>
124113
<comment userInput="Removal confirmation modal not displayed when removing default state individual Tab" stepKey="AC3"/>
125-
126114
<dontSee selector="{{PageBuilderActionsSection.modal}}" stepKey="dontSeeModalHeader"/>
127115
<dontSee selector="{{PageBuilderActionsSection.modalOk}}" stepKey="dontSeeModalOkHeader" />
128116
<comment userInput="Tabs with single Tab shown on the stage after save and on the storefront" stepKey="AC4"/>
129-
130117
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
131118
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
132119
<dontSeeElement selector="{{TabOnStage.tabHeader('2')}}" stepKey="dontSeeSecondTab"/>
@@ -136,7 +123,6 @@
136123
<waitForPageLoad stepKey="waitForStoreFrontPageLoad" time="30"/>
137124
<dontSeeElement selector="{{TabOnStorefront.tabHeader('2')}}" stepKey="dontSeeSecondTabOnStorefront"/>
138125
<seeElement selector="{{TabOnStorefront.tabHeader('1')}}" stepKey="seeFirstTabOnStorefront"/>
139-
140126
</test>
141127
<test name="TabsRemoveConfiguredSecondTabWithConfirmation">
142128
<annotations>
@@ -152,12 +138,10 @@
152138
</annotations>
153139
<before>
154140
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
155-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder"/>
156141
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
157142
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
158143
</before>
159144
<after>
160-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
161145
<actionGroup ref="logout" stepKey="logout"/>
162146
</after>
163147
<comment userInput="Given I have added a second Tab on the stage and customized it" stepKey="AC1"/>
@@ -195,7 +179,6 @@
195179
<actionGroup ref="confirmRemovalModal" stepKey="confirmRemoval"/>
196180
<dontSeeElement selector="{{TabOnStage.tabHeader('2')}}" stepKey="dontSeeSecondTab"/>
197181
<seeElement selector="{{TabOnStage.tabHeader('1')}}" stepKey="seeFirstTabOnStage"/>
198-
199182
</test>
200183
<test name="TabsRemoveSecondTabContainingTextWithConfirmation">
201184
<annotations>
@@ -211,13 +194,10 @@
211194
</annotations>
212195
<before>
213196
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
214-
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
215-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder" after="enableWYSIWYG"/>
216197
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
217198
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
218199
</before>
219200
<after>
220-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
221201
<actionGroup ref="logout" stepKey="logout"/>
222202
</after>
223203
<comment userInput="Given I have added Tabs with a second Tab" stepKey="AC1"/>
@@ -229,19 +209,16 @@
229209
<actionGroup ref="dragContentBlockToStage" stepKey="dragTabsIntoStage">
230210
<argument name="contentBlockType" value="PageBuilderTabsContentBlock"/>
231211
</actionGroup>
232-
233212
<actionGroup ref="addTab" stepKey="addSecondTab"/>
234213
<waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
235214
<waitForElementVisible selector="{{TabOnStage.tabHeader('2')}}" stepKey="confirmSecondTab"/>
236215
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusOnContentBlock"/>
237-
238216
<comment userInput="Given I have added a Text content block to the second Tab" stepKey="AC2"/>
239217
<actionGroup ref="dragContentBlockToContainer" stepKey="dragTextOntoTab">
240218
<argument name="contentBlockType" value="PageBuilderTextContentBlock"/>
241219
<argument name="containerTargetType" value="PageBuilderTabContentBlock"/>
242220
<argument name="containerTargetIndex" value="1" />
243221
</actionGroup>
244-
245222
<comment userInput="User deletes tab with content from Tabs, user sees warning message" stepKey="AC3"/>
246223
<click stepKey="clickTabTitle" selector="{{TabOnStage.tabHeader('2')}}"/>
247224
<waitForElementVisible selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit"/>
@@ -251,13 +228,11 @@
251228
<comment userInput="User confirms deleting tab with content, it disappears from Admin preview" stepKey="AC4"/>
252229
<dontSeeElement selector="{{TabOnStage.tabHeader('2')}}" stepKey="dontSeeSecondTab"/>
253230
<comment userInput="Tabs with single Tab shown on the stage after save" stepKey="AC5"/>
254-
255231
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
256232
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
257233
<dontSeeElement selector="{{TabOnStage.tabHeader('2')}}" stepKey="dontSeeSecondTab2"/>
258234
<seeElement selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderTabsContentBlock.role)}}" stepKey="seeTabsInStage"/>
259235
<comment userInput="User goes to the storefront and sees 2 tabs not being displayed" stepKey="AC6"/>
260-
261236
<amOnPage url="{{PageBuilderTabsContentBlock.name}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnPageBuilderPage"/>
262237
<reloadPage stepKey="reloadPage"/>
263238
<waitForPageLoad stepKey="waitForStoreFrontPageLoad" time="30"/>
@@ -278,12 +253,10 @@
278253
</annotations>
279254
<before>
280255
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
281-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder"/>
282256
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
283257
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
284258
</before>
285259
<after>
286-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
287260
<actionGroup ref="logout" stepKey="logout"/>
288261
</after>
289262
<comment userInput="Given I have customized the Edit Tabs container advanced settings" stepKey="AC1"/>
@@ -322,12 +295,10 @@
322295
</annotations>
323296
<before>
324297
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
325-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder"/>
326298
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
327299
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
328300
</before>
329301
<after>
330-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
331302
<actionGroup ref="logout" stepKey="logout"/>
332303
</after>
333304
<comment userInput="Given I have added Tabs container with 3 Tabs to the stage" stepKey="AC1"/>
@@ -367,12 +338,10 @@
367338
</annotations>
368339
<before>
369340
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
370-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder"/>
371341
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
372342
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
373343
</before>
374344
<after>
375-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
376345
<actionGroup ref="logout" stepKey="logout"/>
377346
</after>
378347
<comment userInput="Given I have customized a Tab on the stage and copied it" stepKey="AC1"/>
@@ -454,9 +423,7 @@
454423
</actionGroup>
455424
<dontSee selector="{{PageBuilderActionsSection.modal}}" stepKey="dontSeeModalHeaderAfterHeader"/>
456425
<dontSee selector="{{PageBuilderActionsSection.modalOk}}" stepKey="dontSeeModalOkHeaderAfterHeader" />
457-
458426
<!-- Validate the items are removed -->
459427
<dontSeeElement selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderHeadingContentBlock.role)}}" stepKey="dontSeeHeaderInStage"/>
460-
461428
</test>
462429
</tests>

0 commit comments

Comments
 (0)