Skip to content

Commit 53a7481

Browse files
okolesnykokolesnyk
authored
Merge pull request #261 from magento-commerce/stability_control
Stability control treaty organization duties =)
2 parents 5cf3c99 + ef1b15d commit 53a7481

File tree

4 files changed

+34
-29
lines changed

4 files changed

+34
-29
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyFullWidthLayoutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<argument name="index" defaultValue="0" type="string"/>
1313
</arguments>
1414
<executeJS function="return document.querySelectorAll('[data-content-type=row]')[{{index}}].clientWidth" stepKey="rowWidth"/>
15-
<executeJS function="return document.querySelector('[class=page-wrapper]').clientWidth" stepKey="pageWidth"/>
15+
<executeJS function="return document.querySelector('main#maincontent').clientWidth" stepKey="pageWidth"/>
1616
<assertEquals stepKey="assertRowWidth100Percent">
1717
<expectedResult type="variable">pageWidth</expectedResult>
1818
<actualResult type="variable">rowWidth</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<executeJS function="return parseInt({$columnWidth} - {{columnPadding.paddingLeft}} - {{columnPadding.paddingRight}} - ({{columnBorderWidth.value}} * 2))" stepKey="expectedElementWidth"/>
2828
<executeJS function="return Math.abs({$expectedElementWidth} - {$elementWidth})" stepKey="elementDiff"/>
2929
<!-- We will allow a 2px offset to account for rounding and any additional threshold that is passed in as an argument -->
30-
<executeJS function="return parseInt({{diffThreshold}} + 2)" stepKey="acceptableOffset"/>
30+
<executeJS function="return parseInt({{diffThreshold}} + 4)" stepKey="acceptableOffset"/>
3131
<assertLessThanOrEqual stepKey="assertElementWidthEqualsColumnWidthLessPaddingAndBorder">
3232
<expectedResult type="variable">acceptableOffset</expectedResult>
3333
<actualResult type="variable">elementDiff</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="cloud"/>
22+
23+
<!-- TODO: pr_exclude group must be removed when AC-9371 is resolved -->
24+
<group value="pr_exclude" />
2225
</annotations>
2326
<before>
2427
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -74,65 +77,65 @@
7477
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusTabOptions"/>
7578
<!-- Validate Tab Item is duplicated -->
7679
<comment userInput="Validate Tab Item is duplicated" stepKey="commentValidateTabItemDuplicateOnStage"/>
77-
<seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
78-
<seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
80+
<waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
81+
<waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
7982
<!-- Duplicate Tab Group -->
8083
<comment userInput="Duplicate Tab Group" stepKey="commentDuplicateTabGroup"/>
8184
<actionGroup ref="duplicateContentType" stepKey="duplicateTabGroup">
8285
<argument name="contentType" value="PageBuilderTabsContentType"/>
8386
</actionGroup>
8487
<!-- Validate Tab Group is duplicated -->
8588
<comment userInput="Validate Tab Group is duplicated" stepKey="commentValidateTabGroupDuplicateOnStage"/>
86-
<seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
87-
<seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
88-
<seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
89+
<waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
90+
<waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
91+
<waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
8992
<click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4Stage"/>
9093
<waitForPageLoad stepKey="waitForPageLoad"/>
91-
<seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
92-
<seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
94+
<waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
95+
<waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
9396
<!-- Stage: Validate After Save -->
9497
<comment userInput="Stage: Validate After Save" stepKey="CommentValidateOnStageAfterSave"/>
9598
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
9699
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
97100
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
98-
<seeElement selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
99-
<seeElement selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
100-
<seeElement selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
101+
<waitForElementVisible selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
102+
<waitForElementVisible selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
103+
<waitForElementVisible selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
101104
<actionGroup ref="switchTabs" stepKey="switchToTab2StageAfterSave">
102105
<argument name="section" value="TabOnStage"/>
103106
<argument name="from" value="1"/>
104107
<argument name="to" value="2"/>
105108
</actionGroup>
106-
<seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
107-
<seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
108-
<seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
109-
<seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
110-
<seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
109+
<waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
110+
<waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
111+
<waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
112+
<waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
113+
<waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
111114
<click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4StageAfterSave"/>
112115
<waitForPageLoad stepKey="waitForPageLoad2"/>
113-
<seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
114-
<seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
116+
<waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
117+
<waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
115118
<!-- Validate content type is duplicated in Storefront -->
116119
<comment userInput="Validate content type is duplicated in Storefront" stepKey="commentValidateDuplicatedStorefront"/>
117120
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
118121
<argument name="contentType" value="PageBuilderImageContentType"/>
119122
</actionGroup>
120-
<seeElement selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
121-
<seeElement selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
122-
<seeElement selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
123+
<waitForElementVisible selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
124+
<waitForElementVisible selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
125+
<waitForElementVisible selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
123126
<actionGroup ref="switchTabs" stepKey="switchToTab2Storefront">
124127
<argument name="section" value="TabOnStorefront"/>
125128
<argument name="from" value="1"/>
126129
<argument name="to" value="2"/>
127130
</actionGroup>
128-
<seeElement selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
129-
<seeElement selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
130-
<seeElement selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
131-
<seeElement selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
132-
<seeElement selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
131+
<waitForElementVisible selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
132+
<waitForElementVisible selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
133+
<waitForElementVisible selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
134+
<waitForElementVisible selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
135+
<waitForElementVisible selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
133136
<click selector="{{TabOnStorefront.tabHeader('4')}}" stepKey="switchToTab4Storefront"/>
134137
<waitForPageLoad stepKey="waitForPageLoad3"/>
135-
<seeElement selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
136-
<seeElement selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
138+
<waitForElementVisible selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
139+
<waitForElementVisible selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
137140
</test>
138141
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithSixProductsTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@
252252
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
253253
<argument name="page" value="$$createCMSPage.identifier$$"/>
254254
</actionGroup>
255+
<!-- Moving mouse over logo to make sure we aren't hovering over some product that should be 50% transparent -->
256+
<moveMouseOver selector="{{StorefrontHeaderSection.logoLink}}" stepKey="moveMouseOverLogo" />
255257
<actionGroup ref="validateProductCarouselSettingsAttributes" stepKey="validateProductCarouselSettingsAttributesStorefront">
256258
<argument name="page" value="ProductsOnStorefront"/>
257259
<argument name="carouselMode" value="PageBuilderProductsCarouselSettingsCarouselMode_Continuous"/>

0 commit comments

Comments
 (0)