Skip to content

Commit 12a6b26

Browse files
chittimachittima
committed
Merge branch 'develop' of https://github.com/magento-commerce/magento2-page-builder into PR-L3-08112023
2 parents 62450ed + e566ad2 commit 12a6b26

File tree

115 files changed

+160
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+160
-152
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/BackgroundConfigurationActionGroup/ValidateBackgroundMobileImageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
</assertRegExp>
2929
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
3030
<waitForElementVisible selector="{{section.backgroundMobileImage(index, backgroundMobileImage.fileName)}}" stepKey="waitForBackgroundMobileImageVisible"/>
31-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
31+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3232
</actionGroup>
3333
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateContainedRowAppearanceActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<argument name="index" defaultValue="1" type="string"/>
1515
</arguments>
1616
<comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
17-
<resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
17+
<resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
1818
<executeJS function="return {{pageOrStageWidthJS}}" stepKey="pageOrStageWidth"/>
1919
<executeJS function="return {{section.rowWidthJS(index)}}" stepKey="rowWidth"/>
2020
<assertGreaterThan stepKey="assertRowWidthGreaterThanZero">
@@ -25,6 +25,6 @@
2525
<expectedResult type="variable">pageOrStageWidth</expectedResult>
2626
<actualResult type="variable">rowWidth</actualResult>
2727
</assertLessThan>
28-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
28+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
2929
</actionGroup>
3030
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullWidthRowAppearanceActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<argument name="affordanceValue" defaultValue="0" type="string"/>
2121
</arguments>
2222
<comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
23-
<resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
23+
<resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
2424
<executeJS function="return {{pageOrStageWidthJS}} - {{affordanceValue}}" stepKey="pageOrStageWidth"/>
2525
<executeJS function="return {{section.rowWidthJS(rowIndex)}}" stepKey="rowWidth"/>
2626
<executeJS function="return parseInt({{section.rowChildContentWidthJS(rowIndex, childContentType.role, childContentTypeIndex)}} + {{padding.paddingLeft}} + {{padding.paddingRight}} + ({{childContentTypeBorder.value}}*2))" stepKey="rowChildElementWidth"/>
@@ -41,6 +41,6 @@
4141
<expectedResult type="int">1300</expectedResult>
4242
<actualResult type="variable">rowChildElementWidth</actualResult>
4343
</assertLessThanOrEqual>
44-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
44+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
4545
</actionGroup>
4646
</actionGroups>

‎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/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageFullWidthLayoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<after>
3232
<!-- Delete Data -->
33-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
33+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCategoryFullWidthLayoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
<after>
6868
<!-- Delete Data -->
69-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
69+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
7070
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
7171
<deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
7272
<deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyProductFullWidthLayoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
<after>
7979
<!-- Delete Data & Revert Attribute -->
80-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
80+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
8181
<deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
8282
<deleteData createDataKey="createProduct1" stepKey="deleteCreatedProduct1"/>
8383
<deleteData createDataKey="createProduct2" stepKey="deleteCreatedProduct2"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</actionGroup>
3535
</before>
3636
<after>
37-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
37+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3838
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
3939
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
4040
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageGIFTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</actionGroup>
3535
</before>
3636
<after>
37-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
37+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3838
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
3939
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
4040
<argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_GIF.path}}"/>

0 commit comments

Comments
 (0)