Skip to content

Commit 934e4c6

Browse files
author
Hwashiang Yu
committed
MC-4075: Alignment attribute not working as expected for product, map, divider, video
- Updated map test and selector for removing alignment attribute
1 parent cf32fd0 commit 934e4c6

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,27 @@
406406
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
407407
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
408408
</actionGroup>
409+
<actionGroup name="validateAdvancedStyleWithAllUpdatedWithNoAlignment">
410+
<arguments>
411+
<argument name="page" defaultValue=""/>
412+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
413+
<argument name="borderColor" defaultValue=""/>
414+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
415+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
416+
<argument name="cssClasses" defaultValue=""/>
417+
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
418+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
419+
<argument name="index" defaultValue="1" type="string"/>
420+
</arguments>
421+
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
422+
<waitForElementVisible selector="{{page.border(index, border.value)}}" stepKey="waitForBorderVisible"/>
423+
<waitForElementVisible selector="{{page.borderColor(index, borderColor.rgb)}}" stepKey="waitForBorderColorVisible"/>
424+
<waitForElementVisible selector="{{page.borderWidth(index, borderWidth.value)}}" stepKey="waitForBorderWidthVisible"/>
425+
<waitForElementVisible selector="{{page.borderRadius(index, borderRadius.value)}}" stepKey="waitForBorderRadiusVisible"/>
426+
<waitForElementVisible selector="{{page.cssClasses(index, cssClasses.value)}}" stepKey="waitForCSSClassesVisible"/>
427+
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
428+
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
429+
</actionGroup>
409430
<actionGroup name="validateAdvancedStyleWithAllUpdatedNotVisible">
410431
<arguments>
411432
<argument name="page" defaultValue=""/>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@
405405
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
406406
<!-- Validate Stage -->
407407
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
408-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
408+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage">
409409
<argument name="page" value="MapOnStage"/>
410410
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
411411
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -447,7 +447,7 @@
447447
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
448448
<!-- Validate Stage After Save -->
449449
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
450-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
450+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage2">
451451
<argument name="page" value="MapOnStage"/>
452452
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
453453
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -489,7 +489,7 @@
489489
</actionGroup>
490490
<!-- Validate Storefront -->
491491
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
492-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
492+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStorefront">
493493
<argument name="page" value="MapOnStorefront"/>
494494
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
495495
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -663,7 +663,7 @@
663663
<argument name="height" value="PageBuilderMapHeightProperty350"/>
664664
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
665665
</actionGroup>
666-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage1">
666+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage1">
667667
<argument name="page" value="MapOnStage"/>
668668
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
669669
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -713,7 +713,7 @@
713713
<argument name="height" value="PageBuilderMapHeightProperty350"/>
714714
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
715715
</actionGroup>
716-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
716+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage2">
717717
<argument name="page" value="MapOnStage"/>
718718
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
719719
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -916,7 +916,7 @@
916916
<argument name="height" value="PageBuilderMapHeightProperty350"/>
917917
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
918918
</actionGroup>
919-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
919+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStorefront">
920920
<argument name="page" value="MapOnStorefront"/>
921921
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
922922
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -1108,7 +1108,7 @@
11081108
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
11091109
<argument name="index" value="2"/>
11101110
</actionGroup>
1111-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage1">
1111+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage1">
11121112
<argument name="page" value="MapOnStage"/>
11131113
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
11141114
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -1325,7 +1325,7 @@
13251325
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
13261326
<argument name="index" value="2"/>
13271327
</actionGroup>
1328-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
1328+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage2">
13291329
<argument name="page" value="MapOnStage"/>
13301330
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
13311331
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
@@ -1540,7 +1540,7 @@
15401540
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
15411541
<argument name="index" value="2"/>
15421542
</actionGroup>
1543-
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
1543+
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStorefront">
15441544
<argument name="page" value="MapOnStorefront"/>
15451545
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
15461546
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>

0 commit comments

Comments
 (0)