Skip to content

Commit e07961e

Browse files
dhaeckerdhaecker
committed
MC-822: [Jenkins] MFTF Failures After Merge
- Updating slide data to work for image deletion - Updating map & color picker elements - Fixing tests to pass & clean up after themselves
1 parent b56762f commit e07961e

File tree

6 files changed

+62
-33
lines changed

6 files changed

+62
-33
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,17 @@
212212
<data key="value">magento.jpg</data>
213213
<data key="fileName">magento</data>
214214
<data key="extension">jpg</data>
215-
<data key="path">wysiwyg/magento</data>
215+
<data key="path">wysiwyg</data>
216216
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
217217
</entity>
218218
<entity name="PageBuilderSlideBackgroundImageProperty2" type="pagebuilder_image_property">
219219
<data key="name">Background Image</data>
220220
<data key="section">background</data>
221221
<data key="fieldName">background_image</data>
222222
<data key="value">magento2.jpg</data>
223+
<data key="fileName">magento2</data>
223224
<data key="extension">jpg</data>
224-
<data key="path">wysiwyg/magento2</data>
225+
<data key="path">wysiwyg</data>
225226
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
226227
</entity>
227228
<entity name="PageBuilderSlideBackgroundImageProperty" type="pagebuilder_background_image_property">

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderActionsSection.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,19 @@
138138
</section>
139139
<section name="ColorPicker">
140140
<element name="colorSwatch" type="button" selector=".sp-preview"/>
141-
<element name="colorPickerWindow" type="button" selector=".sp-container[style]"/>
142-
<element name="allColorBoxes" type="button" selector=".sp-container[style] .sp-palette-row:not(.sp-palette-row-selection) [data-color]"/>
143-
<element name="colorBox" type="button" selector=".sp-container[style] [data-color='{{arg1}}']" parameterized="true"/>
144-
<element name="firstColorBox" type="button" selector=".sp-container[style] [data-color='rgb(252, 0, 9)']"/>
145-
<element name="activeFavoriteColorBox" type="button" selector=".sp-container[style] .sp-palette-row.sp-palette-row-selection .sp-thumb-active[data-color='{{arg1}}']" parameterized="true"/>
146-
<element name="colorWheel" type="button" selector=".sp-container[style] .sp-val"/>
147-
<element name="colorWheelColor" type="button" selector=".sp-container[style] .sp-color[style='background-color: {{arg1}};']" parameterized="true"/>
148-
<element name="inputField" type="input" selector=".sp-container[style] .sp-input"/>
149-
<element name="clearColorBtn" type="button" selector=".sp-container[style] [title='Clear Color Selection']"/>
150-
<element name="hueSlider" type="button" selector=".sp-container[style] .sp-hue"/>
151-
<element name="lightDarkSlider" type="button" selector=".sp-container[style] .sp-alpha"/>
152-
<element name="cancelBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style]//a[text()='Cancel']"/>
153-
<element name="applyBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style]//button[text()='Apply']"/>
141+
<element name="colorPickerWindow" type="button" selector=".sp-container[style]:last-child"/>
142+
<element name="allColorBoxes" type="button" selector=".sp-container[style]:last-child .sp-palette-row:not(.sp-palette-row-selection) [data-color]"/>
143+
<element name="colorBox" type="button" selector=".sp-container[style]:last-child [data-color='{{arg1}}']" parameterized="true"/>
144+
<element name="firstColorBox" type="button" selector=".sp-container[style]:last-child [data-color='rgb(252, 0, 9)']"/>
145+
<element name="activeFavoriteColorBox" type="button" selector=".sp-container[style]:last-child .sp-palette-row.sp-palette-row-selection .sp-thumb-active[data-color='{{arg1}}']" parameterized="true"/>
146+
<element name="colorWheel" type="button" selector=".sp-container[style]:last-child .sp-val"/>
147+
<element name="colorWheelColor" type="button" selector=".sp-container[style]:last-child .sp-color[style='background-color: {{arg1}};']" parameterized="true"/>
148+
<element name="inputField" type="input" selector=".sp-container[style]:last-child .sp-input"/>
149+
<element name="clearColorBtn" type="button" selector=".sp-container[style]:last-child [title='Clear Color Selection']"/>
150+
<element name="hueSlider" type="button" selector=".sp-container[style]:last-child .sp-hue"/>
151+
<element name="lightDarkSlider" type="button" selector=".sp-container[style]:last-child .sp-alpha"/>
152+
<element name="cancelBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style][last()]//a[text()='Cancel']"/>
153+
<element name="applyBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style][last()]//button[text()='Apply']"/>
154154
</section>
155155
<section name="EditPanelForm">
156156
<element name="backgroundImagePreview" type="button" selector='//div[@data-index="background"]/descendant::img[@class="preview-image"]'/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<element name="addressCityStateZipCountry" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[@class='gm-style-iw']//span[.='{{arg2}}{{arg3}}{{arg4}}{{arg5}}{{arg6}}']" parameterized="true"/>
2626
<!-- Map Settings Configuration -->
2727
<element name="height" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and contains(@style,'height: {{arg2}}px;')]" parameterized="true"/>
28+
<element name="noHeight" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and not(contains(@style,'height:'))]" parameterized="true"/>
2829
<element name="computedHeight" type="text" selector="parseInt(window.getComputedStyle(document.querySelector('.pagebuilder-map > div:first-child')).height)"/>
2930
<element name="showControls" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and @data-show-controls='{{arg2}}']" parameterized="true"/>
3031
<!-- Advanced Configuration -->
@@ -70,6 +71,7 @@
7071
<element name="addressCityStateZipCountry" type="text" selector="(//div[@data-role='map'])[{{arg1}}]//div[@class='gm-style-iw']//span[.='{{arg2}}{{arg3}}{{arg4}}{{arg5}}{{arg6}}']" parameterized="true"/>
7172
<!-- Map Settings Configuration -->
7273
<element name="height" type="button" selector="(//div[@data-role='map'])[{{arg1}}][contains(@style,'height: {{arg2}}px;')]" parameterized="true"/>
74+
<element name="noHeight" type="button" selector="(//div[@data-role='map'])[{{arg1}}][not(contains(@style,'height:'))]" parameterized="true"/>
7375
<element name="computedHeight" type="text" selector="parseInt(window.getComputedStyle(document.querySelector('[data-role=map]')).height)"/>
7476
<element name="showControls" type="text" selector="(//div[@data-role='map'])[{{arg1}}][@data-show-controls='{{arg2}}']" parameterized="true"/>
7577
<!-- Advanced Configuration -->

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,17 @@
2626
</before>
2727
<after>
2828
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
29-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
30-
<argument name="FolderName" value="{{PageBuilderImageProperty_JPG.path}}"/>
29+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder1">
30+
<argument name="FolderName" value="{{PageBuilderImageProperty_StageJPG.path}}"/>
3131
</actionGroup>
32-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
33-
<argument name="Image" value="PageBuilderImageProperty_JPG"/>
32+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
33+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
34+
</actionGroup>
35+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
36+
<argument name="FolderName" value="{{PageBuilderImageProperty_JPG2.path}}"/>
37+
</actionGroup>
38+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
39+
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
3440
</actionGroup>
3541
<actionGroup ref="logout" stepKey="logout"/>
3642
</after>

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

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,24 @@
145145
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
146146
<!-- Validate Stage After Save -->
147147
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage"/>
148-
<actionGroup ref="validateMapSettings" stepKey="validateMapStage">
149-
<argument name="page" value="MapOnStage"/>
150-
<argument name="height" value="PageBuilderMapHeightDefaultProperty"/>
151-
</actionGroup>
148+
<waitForElementVisible selector="{{MapOnStage.base('1')}}" stepKey="waitForMapStage"/>
149+
<waitForElementVisible selector="{{MapOnStage.noHeight('1')}}" stepKey="waitForMapHeightStage"/>
150+
<executeJS function="return {{MapOnStage.computedHeight}}" stepKey="mapHeightStage"/>
151+
<assertEquals stepKey="assertMapHeightStage">
152+
<expectedResult type="string">{{PageBuilderMapHeightDefaultProperty.value}}</expectedResult>
153+
<actualResult type="variable">$mapHeightStage</actualResult>
154+
</assertEquals>
152155
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
153156
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
154157
<!-- Validate Stage After Edit And Save -->
155158
<comment userInput="Validate Stage After Edit And Save" stepKey="commentValidateStageAfterEditAndSave"/>
156-
<actionGroup ref="validateMapSettings" stepKey="validateMapStage2">
157-
<argument name="page" value="MapOnStage"/>
158-
<argument name="height" value="PageBuilderMapHeightDefaultProperty"/>
159-
</actionGroup>
159+
<waitForElementVisible selector="{{MapOnStage.base('1')}}" stepKey="waitForMapStage2"/>
160+
<waitForElementVisible selector="{{MapOnStage.noHeight('1')}}" stepKey="waitForMapHeightStage2"/>
161+
<executeJS function="return {{MapOnStage.computedHeight}}" stepKey="mapHeightStage2"/>
162+
<assertEquals stepKey="assertMapHeightStage2">
163+
<expectedResult type="string">{{PageBuilderMapHeightDefaultProperty.value}}</expectedResult>
164+
<actualResult type="variable">$mapHeightStage2</actualResult>
165+
</assertEquals>
160166
<!-- Validate Edit Panel After Edit And Save -->
161167
<comment userInput="Validate Edit Panel After Edit And Save" stepKey="commentValidateEditPanelAfterEditAndSave"/>
162168
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
@@ -170,10 +176,13 @@
170176
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
171177
<argument name="contentType" value="PageBuilderMapContentType"/>
172178
</actionGroup>
173-
<actionGroup ref="validateMapSettings" stepKey="validateMapStoreFront">
174-
<argument name="page" value="MapOnStorefront"/>
175-
<argument name="height" value="PageBuilderMapHeightDefaultProperty"/>
176-
</actionGroup>
179+
<waitForElementVisible selector="{{MapOnStorefront.base('1')}}" stepKey="waitForMapStorefront"/>
180+
<waitForElementVisible selector="{{MapOnStorefront.noHeight('1')}}" stepKey="waitForMapHeightStorefront"/>
181+
<executeJS function="return {{MapOnStorefront.computedHeight}}" stepKey="mapHeightStorefront"/>
182+
<assertEquals stepKey="assertMapHeightStorefront">
183+
<expectedResult type="string">{{PageBuilderMapHeightDefaultProperty.value}}</expectedResult>
184+
<actualResult type="variable">$mapHeightStorefront</actualResult>
185+
</assertEquals>
177186
</test>
178187
<test name="MapHeightInvalidInputs">
179188
<annotations>

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,19 @@
2727
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2828
</before>
2929
<after>
30+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
31+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder1">
32+
<argument name="FolderName" value="{{PageBuilderSlideBackgroundImageProperty1.path}}"/>
33+
</actionGroup>
34+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
35+
<argument name="Image" value="PageBuilderSlideBackgroundImageProperty1"/>
36+
</actionGroup>
37+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
38+
<argument name="FolderName" value="{{PageBuilderSlideBackgroundImageProperty2.path}}"/>
39+
</actionGroup>
40+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
41+
<argument name="Image" value="PageBuilderSlideBackgroundImageProperty2"/>
42+
</actionGroup>
3043
<actionGroup ref="logout" stepKey="logout"/>
3144
</after>
3245
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -173,7 +186,6 @@
173186
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlide1ContentDisplayedAdmin"/>
174187
<see userInput="{{PageBuilderSlideItemButtonText1.value}}" selector="{{SlideOnBackend.slideButtonText('0')}}" stepKey="seeSlide1ButtonTextDisplayedAdmin"/>
175188
<seeElement selector="{{SlideOnBackend.slideAppearancePoster('0')}}" stepKey="verifySlide1HasPosterAppearance"/>
176-
<seeElement selector="{{SlideOnBackend.slideLinkURL1(PageBuilderSlideItemLinkURL1.value)}}" stepKey="seeSlide1LinkURLAdmin"/>
177189
<seeElement selector="{{SlideOnBackend.slideBackgroundImage('0',PageBuilderSlideBackgroundImageProperty1.path, PageBuilderSlideBackgroundImageProperty1.extension)}}" stepKey="seeSlide1BackgroundAdmin"/>
178190
<click selector="{{SliderInAdmin.nextSlide}}" stepKey="clickNextSlideOnSliderAdmin"/>
179191
<waitForElementVisible time="2" selector="{{SlideOnBackend.slide('1')}}" stepKey="waitForSlide2Admin" />
@@ -183,7 +195,6 @@
183195
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('1')}}" stepKey="seeSlide2ContentDisplayedAdmin"/>
184196
<see userInput="{{PageBuilderSlideItemButtonText2.value}}" selector="{{SlideOnBackend.slideButtonText('1')}}" stepKey="seeSlide2LinkTextDisplayedAdmin"/>
185197
<seeElement selector="{{SlideOnBackend.slideAppearancePoster('1')}}" stepKey="verifySlide2HasPosterAppearance"/>
186-
<seeElement selector="{{SlideOnBackend.slideLinkURL2(PageBuilderSlideItemLinkURL2.value)}}" stepKey="seeSlide2LinkURLAdmin"/>
187198
<seeElement selector="{{SlideOnBackend.slideBackgroundImage('1',PageBuilderSlideBackgroundImageProperty2.path, PageBuilderSlideBackgroundImageProperty2.extension)}}" stepKey="seeSlide2BackgroundAdmin"/>
188199
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
189200
<argument name="contentType" value="PageBuilderSliderContentType"/>

0 commit comments

Comments
 (0)