Skip to content

Commit 59b0e7e

Browse files
mmansoor-magentommansoor-magento
authored
Merge pull request #269 from magento-cia/2.4.7-beta2-develop-2.4-develop-sync-09112023
Sync of 2.4.7-beta2-develop with 2.4-develop
2 parents c5682cb + 999625f commit 59b0e7e

File tree

112 files changed

+144
-124
lines changed

Some content is hidden

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

112 files changed

+144
-124
lines changed

‎app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php

+18-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ class Collection extends TemplateCollection implements SearchResultInterface
3131
*/
3232
private $aggregations;
3333

34+
/** @var string */
35+
private $model;
36+
37+
/** @var string */
38+
private $resourceModel;
39+
3440
/**
3541
* @param EntityFactoryInterface $entityFactory
3642
* @param LoggerInterface $logger
@@ -58,6 +64,8 @@ public function __construct(
5864
$connection = null,
5965
AbstractDb $resource = null
6066
) {
67+
$this->resourceModel = $resourceModel;
68+
$this->model = $model;
6169
parent::__construct(
6270
$entityFactory,
6371
$logger,
@@ -68,10 +76,19 @@ public function __construct(
6876
);
6977
$this->_eventPrefix = $eventPrefix;
7078
$this->_eventObject = $eventObject;
71-
$this->_init($model, $resourceModel);
79+
$this->_init($this->model, $this->resourceModel);
7280
$this->setMainTable($mainTable);
7381
}
7482

83+
/**
84+
* @inheritDoc
85+
*/
86+
public function _resetState(): void
87+
{
88+
parent::_resetState();
89+
$this->_init($this->model, $this->resourceModel);
90+
}
91+
7592
/**
7693
* Get aggregations
7794
*

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundMobileImageActionGroup.xml

+1-1
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

+2-2
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

+2-2
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/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageFullWidthLayoutTest.xml

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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}}"/>

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

+1-1
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_JPG.path}}"/>

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

+1-1
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_JPG.path}}"/>

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

+1-1
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_JPG.path}}"/>

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

+1-1
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_PNG.path}}"/>

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

+1-1
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
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
4040
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">

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

+1-1
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_SpecialCharacters.path}}"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonNeverShowTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithMobileImageValuesTest.xml

+1-1
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/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithoutMobileImageValuesTest.xml

+1-1
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/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayNeverShowTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAllAttributesTest.xml

+1-1
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/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonNeverShowTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithMobileImageValuesTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</actionGroup>
3434
</before>
3535
<after>
36-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
36+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3737
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
3838
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
3939
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithoutMobileImageValuesTest.xml

+1-1
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/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayNeverShowTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAllAttributesTest.xml

+1-1
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/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonNeverShowTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</actionGroup>
3434
</before>
3535
<after>
36-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
36+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3838
</after>
3939
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithMobileImageValuesTest.xml

+1-1
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/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithoutMobileImageValuesTest.xml

+1-1
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/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayNeverShowTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAllAttributesTest.xml

+1-1
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/AdminPageBuilderBannerCommonTest/DuplicateBannerTest.xml

+1-1
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/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAddWYSIWYGLinkTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonNeverShowTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</actionGroup>
3232
</before>
3333
<after>
34-
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
34+
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
3535
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3636
</after>
3737
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

0 commit comments

Comments
 (0)