Skip to content

Commit c5682cb

Browse files
mmansoor-magentommansoor-magento
authored
Merge pull request #263 from magento-cia/develop-pre-release-sync-08252023
Develop pre release sync 08252023
2 parents f48819e + 02d4f37 commit c5682cb

File tree

194 files changed

+1005
-407
lines changed

Some content is hidden

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

194 files changed

+1005
-407
lines changed

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Suite/RemoteStorageAwsS3EnabledPageBuilderSuite.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1919
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
2020
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
21-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
21+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
22+
<argument name="tags" value="config"/>
23+
</actionGroup>
2224
</before>
2325
<after>
2426
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
@@ -28,7 +30,9 @@
2830
</actionGroup>
2931
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
3032
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
31-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
33+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
34+
<argument name="tags" value="config"/>
35+
</actionGroup>
3236
</after>
3337
<include>
3438
<group name="remote_storage_aws_s3_pagebuilder"/>

‎app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Magento\PageBuilder\Model\Config as PageBuilderConfig;
1919
use Magento\PageBuilder\Model\State as PageBuilderState;
2020
use Magento\PageBuilder\Model\Stage\Config as Config;
21+
use Magento\Framework\AuthorizationInterface;
2122

2223
/**
2324
* Updates wysiwyg element with Page Builder specific config
@@ -26,11 +27,19 @@
2627
*/
2728
class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
2829
{
30+
31+
private const ADMIN_RESOURCE = 'Magento_Backend::content';
32+
2933
/**
3034
* @var Repository
3135
*/
3236
private $assetRepo;
3337

38+
/**
39+
* @var AuthorizationInterface
40+
*/
41+
private $authorization;
42+
3443
/**
3544
* WYSIWYG Constructor
3645
*
@@ -46,6 +55,7 @@ class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
4655
* @param PageBuilderConfig|null $pageBuilderConfig
4756
* @param bool $overrideSnapshot
4857
* @param Repository|null $assetRepo
58+
* @param AuthorizationInterface|null $authorization
4959
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
5060
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
5161
* @SuppressWarnings(PHPMD.NPathComplexity)
@@ -62,9 +72,11 @@ public function __construct(
6272
array $config = [],
6373
PageBuilderConfig $pageBuilderConfig = null,
6474
bool $overrideSnapshot = false,
65-
Repository $assetRepo = null
75+
Repository $assetRepo = null,
76+
AuthorizationInterface $authorization = null
6677
) {
6778
$this->assetRepo = $assetRepo ?: ObjectManager::getInstance()->get(Repository::class);
79+
$this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);
6880
$wysiwygConfigData = $config['wysiwygConfigData'] ?? [];
6981

7082
// If a dataType is present we're dealing with an attribute
@@ -79,11 +91,11 @@ public function __construct(
7991
$config['wysiwyg'] = true;
8092
}
8193
}
82-
94+
$isAllowed = $this->authorization->isAllowed(self::ADMIN_RESOURCE);
8395
$isEnablePageBuilder = isset($wysiwygConfigData['is_pagebuilder_enabled'])
8496
&& !$wysiwygConfigData['is_pagebuilder_enabled']
8597
|| false;
86-
if (!$pageBuilderState->isPageBuilderInUse($isEnablePageBuilder)) {
98+
if (!$pageBuilderState->isPageBuilderInUse($isEnablePageBuilder) && $isAllowed) {
8799
// This is not done using definition.xml due to https://github.com/magento/magento2/issues/5647
88100
$data['config']['component'] = 'Magento_PageBuilder/js/form/element/wysiwyg';
89101

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<argument name="editButtonSelector" defaultValue="{{PageBuilderStage.editButtonSelector}}" type="string"/>
1616
<argument name="rowIndex" defaultValue="1" type="string"/>
1717
</arguments>
18-
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
18+
<waitForElementClickable selector="{{sectionSelector}}" stepKey="waitForSection"/>
1919
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
2020
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
2121
<waitForElementVisible time="30" selector="{{snapshotSelector}}" stepKey="waitForSnapshot"/>

‎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/ContentTypeProductsActionGroup/StorefrontClickProductAddToCartValidateAsyncActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<waitForElementVisible selector="{{ProductsOnStorefront.productImageByProductName(product)}}" stepKey="waitForProductImage"/>
1515
<moveMouseOver selector="{{ProductsOnStorefront.productImageByProductName(product)}}" stepKey="moveMouseOverProduct"/>
1616
<click selector="{{ProductsOnStorefront.productAddToCartByProductName(product)}}" stepKey="clickProductAddToCart"/>
17-
<seeElement selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="seeAddingButtonLabel"/>
17+
<seeElement selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAddingOrAdded}}" stepKey="seeAddingButtonLabel"/>
1818
<waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForAddedButtonLabel"/>
1919
<seeElement selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="seeAddedButtonLabel"/>
2020
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
21-
<see userInput="You added {{product}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
21+
<waitForText userInput="You added {{product}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
2222
</actionGroup>
2323
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateFullScreenVideoHasPlaysinlineAttributeActionGroup.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateFullScreenVideoHasPlaysinlineAttributeActionGroup">
11+
<executeJS function="return document.querySelectorAll('{{VideoOnStorefront.mainCSS}} {{VideoOnStorefront.videoWithPlaysinline}}').length" stepKey="playsinlineAttributesCount"/>
12+
<assertEquals stepKey="assertPlaysinlineAttributePresent">
13+
<expectedResult type="string">1</expectedResult>
14+
<actualResult type="variable">playsinlineAttributesCount</actualResult>
15+
</assertEquals>
16+
</actionGroup>
17+
</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/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="VideoOnStorefront">
1111
<element name="allVideo" type="text" selector="[data-content-type='video']"/>
12+
<element name="videoWithPlaysinline" type="text" selector="video[playsinline=true]"/>
1213
<element name="mainCSS" type="text" selector="[data-content-type=video][data-element=main]"/>
1314
<element name="wrapperCSS" type="text" selector="[data-content-type=video] [data-element=wrapper]"/>
1415
<element name="main" type="text" selector="(//div[@data-content-type=&quot;video&quot;])[{{arg1}}]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderDisabledSuite.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="PageBuilderDisabledSuite">
10+
<before>
11+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disblePageBuilder"/>
12+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
13+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
14+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
15+
<argument name="tags" value="config"/>
16+
</actionGroup>
17+
</before>
18+
<after>
19+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
20+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
21+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
22+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
23+
<argument name="tags" value="config"/>
24+
</actionGroup>
25+
</after>
26+
<include>
27+
<group name="pagebuilder_disabled"/>
28+
</include>
29+
<exclude>
30+
<group name="pagebuilder"/>
31+
<group name="pagebuilder-requiresValidMapAPIKey"/>
32+
<group name="remote_storage_aws_s3_pagebuilder"/>
33+
</exclude>
34+
</suite>
35+
</suites>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1616
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
1717
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
18-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
18+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
19+
<argument name="tags" value="config"/>
20+
</actionGroup>
1921
</before>
2022
<after>
2123
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
2224
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2325
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2426
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
25-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
27+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
28+
<argument name="tags" value="config"/>
29+
</actionGroup>
2630
</after>
2731
<include>
2832
<group name="pagebuilder-requiresValidMapAPIKey"/>

0 commit comments

Comments
 (0)