Skip to content

Commit 73de79f

Browse files
author
magento packaging service
committed
Version 1.7.3-p9
1 parent 94f5e14 commit 73de79f

File tree

243 files changed

+476
-308
lines changed

Some content is hidden

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

243 files changed

+476
-308
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.3",
49
"require": {
5-
"magento/framework": "*",
10+
"magento/framework": "103.0.*",
611
"php": "~8.1.0||~8.2.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.3",
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": "~8.1.0||~8.2.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.3",
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": "~8.1.0||~8.2.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/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/Section/PageBuilderTextSection/TextOnStageSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<element name="textArea" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//textarea[contains(@class,'inline-wysiwyg-textarea')]" parameterized="true"/>
2929
<element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Text')]" parameterized="true"/>
3030
<element name="textPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
31-
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
31+
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
3232
<element name="tinymceInFocus" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg') and contains(@class, 'mce-edit-focus')]" parameterized="true"/>
3333
<element name="importantStyle" type="text" selector="//span[text()='Important']"/>
3434
<element name="textInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg2}}']" parameterized="true"/>

0 commit comments

Comments
 (0)