Skip to content

Commit 1839c43

Browse files
author
magento packaging service
committed
Version 1.7.1-p13
1 parent 20139ba commit 1839c43

File tree

158 files changed

+797
-257
lines changed

Some content is hidden

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

158 files changed

+797
-257
lines changed

Diff for: ‎app/code/Magento/AwsS3PageBuilder/composer.json

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "magento/module-aws-s3-page-builder",
33
"description": "Aws S3 Page Builder module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
8+
"version": "1.0.2",
49
"require": {
5-
"magento/framework": "*",
10+
"magento/framework": "103.0.*",
611
"php": "~7.4.0||~8.1.0"
712
},
813
"suggest": {
9-
"magento/module-page-builder": "*",
10-
"magento/module-aws-s3": "*"
14+
"magento/module-page-builder": "2.2.*",
15+
"magento/module-aws-s3": "100.4.*"
1116
},
12-
"type": "magento2-module",
13-
"license": [
14-
"proprietary"
15-
],
1617
"autoload": {
1718
"files": [
1819
"registration.php"
@@ -22,3 +23,4 @@
2223
}
2324
}
2425
}
26+

Diff for: ‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-catalog-page-builder-analytics",
33
"description": "Catalog Page Builder Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
48
"config": {
59
"sort-packages": true
610
},
11+
"version": "1.6.2",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
9-
"magento/module-catalog": "*",
10-
"magento/framework": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
14+
"magento/module-catalog": "104.0.*",
15+
"magento/framework": "103.0.*",
1116
"php": "~7.4.0||~8.1.0"
1217
},
13-
"type": "magento2-module",
14-
"license": [
15-
"proprietary"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

Diff for: ‎app/code/Magento/CmsPageBuilderAnalytics/composer.json

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-cms-page-builder-analytics",
33
"description": "CMS Page Builder Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
48
"config": {
59
"sort-packages": true
610
},
11+
"version": "1.6.2",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
9-
"magento/module-cms": "*",
10-
"magento/framework": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
14+
"magento/module-cms": "104.0.*",
15+
"magento/framework": "103.0.*",
1116
"php": "~7.4.0||~8.1.0"
1217
},
13-
"type": "magento2-module",
14-
"license": [
15-
"proprietary"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

Diff for: ‎app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
4242
$config->addData(
4343
[
4444
'tinymce' => [
45-
'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
45+
'toolbar' => 'undo redo | styles | fontsizeselect | lineheight | forecolor backcolor ' .
4646
'| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
4747
'| link image table charmap',
4848

@@ -55,9 +55,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
5555
'link',
5656
'charmap',
5757
'media',
58-
'noneditable',
5958
'table',
60-
'paste',
6159
'code',
6260
'help',
6361
'table',

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup.xml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2025 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
18+
-->
19+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
21+
<actionGroup name="ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup" extends="validateVideoBackgroundPlaying">
22+
<annotations>
23+
<description>Validates that the video in the video background is loaded but not playing.</description>
24+
</annotations>
25+
<assertStringNotContainsString stepKey="assertVideoPlaying">
26+
<expectedResult type="string">backface-visibility: visible;</expectedResult>
27+
<actualResult type="variable">$videoStyle</actualResult>
28+
</assertStringNotContainsString>
29+
</actionGroup>
30+
</actionGroups>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1021
<actionGroup name="validateVideoBackgroundPlaying">
1122
<annotations>
1223
<description>Validates that the video in the video background is playing.</description>
@@ -18,8 +29,8 @@
1829
</arguments>
1930
<waitForPageLoad stepKey="waitForPageLoad"/>
2031
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
21-
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
22-
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
32+
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
33+
<comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
2334
<grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
2435
<assertStringContainsString stepKey="assertVideoPlaying">
2536
<expectedResult type="string">transform: translate3d(</expectedResult>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1021
<actionGroup name="validateVideoBackgroundWithAllAttributes">
1122
<annotations>
1223
<description>Validates all video background attributes when all attributes are configured</description>
@@ -32,7 +43,7 @@
3243
</assertEquals>
3344
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
3445
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
35-
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
46+
<comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
3647
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
3748
<assertStringContainsString stepKey="assertHeight">
3849
<expectedResult type="string">height: 100%;</expectedResult>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1021
<actionGroup name="validateVideoBackgroundWithOnlyVideoUrl">
1122
<annotations>
1223
<description>Validates video background attributes when only the Video URL is set and all other attributes are left as default</description>
@@ -28,8 +39,8 @@
2839
<actualResult type="variable">grabBackgroundColorValue</actualResult>
2940
</assertEquals>
3041
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
31-
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
32-
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
42+
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
43+
<comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
3344
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
3445
<assertStringContainsString stepKey="assertHeight">
3546
<expectedResult type="string">height: 100%;</expectedResult>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/validateVideoBackgroundWithOnlyVideoUrlVimeoActionGroup.xml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2025 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
18+
-->
19+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
21+
<actionGroup name="validateVideoBackgroundWithOnlyVideoUrlVimeoActionGroup" extends="validateVideoBackgroundWithOnlyVideoUrl">
22+
<annotations>
23+
<description>Validates that the vimeo video is playing.</description>
24+
</annotations>
25+
<assertStringContainsString stepKey="assertVideoPlaying">
26+
<expectedResult type="string">position: absolute</expectedResult>
27+
<actualResult type="variable">$videoStyle</actualResult>
28+
</assertStringContainsString>
29+
<comment userInput="To prevent flakiness: Fix for vimeo video fallback image" stepKey="dontSeeFallbackImage"/>
30+
</actionGroup>
31+
</actionGroups>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
1111
<arguments>
1212
<argument name="block" defaultValue="BlockOnStorefront"/>
@@ -15,8 +15,8 @@
1515
<argument name="content"/>
1616
<argument name="contentIndex" defaultValue="1" type="string"/>
1717
</arguments>
18-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top" stepKey="containerCenter"/>
19-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top" stepKey="contentCenter"/>
18+
<executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top)" stepKey="containerCenter"/>
19+
<executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top)" stepKey="contentCenter"/>
2020
<assertEquals stepKey="assertBottomPosition">
2121
<expectedResult type="variable">containerCenter</expectedResult>
2222
<actualResult type="variable">contentCenter</actualResult>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<executeJS function="return Math.round(window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) * {{columnWidth}})" stepKey="grabCalculatedColumnWidthValue"/>
2121
<executeJS function="return Math.abs({$grabColumnWidthValue}-{$grabCalculatedColumnWidthValue})" stepKey="columnWidthDifference"/>
2222
<assertLessThanOrEqual stepKey="assertColumnWidthValue">
23-
<expectedResult type="int">2</expectedResult>
23+
<expectedResult type="int">3</expectedResult>
2424
<actualResult type="variable">columnWidthDifference</actualResult>
2525
</assertLessThanOrEqual>
2626
</actionGroup>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoNotAutoplayingActionGroup.xml

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1021
<actionGroup name="validateVideoNotAutoplaying" extends="validateVideoPlaying">
1122
<annotations>
1223
<description>Validates that the video content type is not autoplaying.</description>
1324
</annotations>
14-
<waitForElementVisible selector="{{page.iframeNotAutoplaying(index)}}" stepKey="seeIframePlaying"/>
25+
<waitForElementVisible selector="{{page.videoNotAutoplay(index)}}" stepKey="seeIframePlaying"/>
1526
</actionGroup>
1627
</actionGroups>

Diff for: ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoPlayingActionGroup.xml

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1021
<actionGroup name="validateVideoPlaying">
1122
<annotations>
1223
<description>Validates that the video content type is playing.</description>
@@ -17,9 +28,9 @@
1728
</arguments>
1829
<waitForPageLoad stepKey="waitForPageLoad"/>
1930
<waitForElementVisible selector="{{page.videoElement(index)}}" stepKey="waitForVideoVisible"/>
20-
<executeJS function="document.querySelector('[data-element=\'video\']').id = 'video-iframe'" stepKey="setIframeId"/>
21-
<switchToIFrame userInput="video-iframe" stepKey="switchToVideoIframe"/>
22-
<waitForElementVisible selector="{{page.iframePlaying(index)}}" stepKey="seeIframePlaying"/>
23-
<switchToIFrame stepKey="switchBackFromIframe"/>
31+
<comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="setIframeId"/>
32+
<comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="switchToVideoIframe"/>
33+
<waitForElementVisible selector="{{page.videoAutoplay(index)}}" stepKey="seeIframePlaying"/>
34+
<comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="switchBackFromIframe"/>
2435
</actionGroup>
2536
</actionGroups>

0 commit comments

Comments
 (0)