Skip to content

Commit 554d41e

Browse files
author
magento packaging service
committed
Version 1.7.2-p10
1 parent d1bdaf5 commit 554d41e

File tree

146 files changed

+444
-214
lines changed

Some content is hidden

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

146 files changed

+444
-214
lines changed

‎app/code/Magento/AwsS3PageBuilder/composer.json‎

Lines changed: 9 additions & 7 deletions
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+

‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json‎

Lines changed: 9 additions & 7 deletions
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+

‎app/code/Magento/CmsPageBuilderAnalytics/composer.json‎

Lines changed: 9 additions & 7 deletions
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+

‎app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php‎

Lines changed: 1 addition & 3 deletions
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',

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
11-
<arguments>
12-
<argument name="block" defaultValue="BlockOnStorefront"/>
13-
<argument name="container"/>
14-
<argument name="containerIndex" defaultValue="1" type="string"/>
15-
<argument name="content"/>
16-
<argument name="contentIndex" defaultValue="1" type="string"/>
17-
</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"/>
20-
<assertEquals stepKey="assertBottomPosition">
21-
<expectedResult type="variable">containerCenter</expectedResult>
22-
<actualResult type="variable">contentCenter</actualResult>
23-
</assertEquals>
24-
</actionGroup>
25-
</actionGroups>
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
11+
<arguments>
12+
<argument name="block" defaultValue="BlockOnStorefront"/>
13+
<argument name="container"/>
14+
<argument name="containerIndex" defaultValue="1" type="string"/>
15+
<argument name="content"/>
16+
<argument name="contentIndex" defaultValue="1" type="string"/>
17+
</arguments>
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"/>
20+
<assertEquals stepKey="assertBottomPosition">
21+
<expectedResult type="variable">containerCenter</expectedResult>
22+
<actualResult type="variable">contentCenter</actualResult>
23+
</assertEquals>
24+
</actionGroup>
25+
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<executeJS function="return Math.round((window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) - 30)* {{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>
27-
</actionGroups>
27+
</actionGroups>

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9-
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
10-
<annotations>
11-
<description>Content types expected style equals the computed style</description>
12-
</annotations>
13-
<arguments>
14-
<argument name="selector" type="string"/>
15-
<argument name="expectedProperty" type="string"/>
16-
<argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
17-
</arguments>
18-
<executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
19-
<assertEquals stepKey="propertyIsEqualsAsExpected">
20-
<expectedResult type="string">{{expectedProperty}}</expectedResult>
21-
<actualResult type="variable">fetchedProperty</actualResult>
22-
</assertEquals>
23-
</actionGroup>
24-
</actionGroups>
9+
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
10+
<annotations>
11+
<description>Content types expected style equals the computed style</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="selector" type="string"/>
15+
<argument name="expectedProperty" type="string"/>
16+
<argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
17+
</arguments>
18+
<executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
19+
<assertEquals stepKey="propertyIsEqualsAsExpected">
20+
<expectedResult type="string">{{expectedProperty}}</expectedResult>
21+
<actualResult type="variable">fetchedProperty</actualResult>
22+
</assertEquals>
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
1313
<element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
1414
<element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
15-
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='URL']"/>
15+
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
1616
<element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
1717
<element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
1818
<element name="targetInput" type="input" selector="button[title='Open link in...']"/>
19-
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
19+
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
2020
<element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
2121
</section>
2222
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
4444
<element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
4545
<element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
46-
<element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
46+
<element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
4747
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
4848
<element name="formatOption" type="text" parameterized="true" selector="//div[contains(@class, 'mce-menu')]//span[contains(@class, 'mce-text') and text()='{{label}}']"/>
4949
</section>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="TinyMCESection">
11-
<element name="Style" type="button" selector="button[title='Formats']"/>
11+
<element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
1212
</section>
1313
</sections>

0 commit comments

Comments
 (0)