Skip to content

Commit 9787542

Browse files
author
magento packaging service
committed
Version 1.7.4-p4
1 parent 8706d60 commit 9787542

File tree

121 files changed

+190
-55
lines changed

Some content is hidden

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

121 files changed

+190
-55
lines changed

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

Lines changed: 7 additions & 5 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.4",
49
"require": {
510
"magento/framework": "*",
611
"php": "~8.1.0||~8.2.0||~8.3.0"
712
},
813
"suggest": {
9-
"magento/module-page-builder": "*",
14+
"magento/module-page-builder": "2.2.*",
1015
"magento/module-aws-s3": "*"
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: 7 additions & 5 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.4",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
914
"magento/module-catalog": "*",
1015
"magento/framework": "*",
1116
"php": "~8.1.0||~8.2.0||~8.3.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: 7 additions & 5 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.4",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
914
"magento/module-cms": "*",
1015
"magento/framework": "*",
1116
"php": "~8.1.0||~8.2.0||~8.3.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/EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.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="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup">
11+
<arguments>
12+
<argument name="property"/>
13+
</arguments>
14+
<waitForElementVisible time="2" selector="{{EditPanelForm.panelFieldNameWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForPropertyElement"/>
15+
<dontSeeElement selector="{{EditPanelForm.panelFieldRequired(property.section, property.fieldName)}}" stepKey="seePropertyIsNotARequiredField"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<element name="panelSectionGenericError" type="text" selector="div.message.message-error.error"/>
2222
<element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
2323
<element name="panelFieldControlWithUploaderId" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@upload-area-id=&quot;{{arg2}}&quot;]//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]" parameterized="true"/>
24+
<element name="panelFieldNameWithUploaderId" type="input" selector="//aside//div[@data-index=&quot;{{propertySection}}&quot;]/descendant::*[@upload-area-id=&quot;{{propertyField}}&quot;]" parameterized="true"/>
2425
<element name="panelFieldControlCheckbox" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}']" parameterized="true"/>
2526
<element name="panelFieldControlCheckboxState" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}' and @value='{{arg2}}']" parameterized="true"/>
2627
<element name="panelFieldControlSwitch" type="input" selector="//*[@name='{{arg1}}']/parent::*/label" parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
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[@title='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...']"/>

‎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[title='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[title='{{label}}']"/>
4949
<element name="HeadSelector" type="text" selector="div[title='Headings']"/>

‎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[title='Format Paragraph']"/>
1212
</section>
1313
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<group value="pagebuilder-bannerCollageCenter"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24+
<group value="pr_exclude"/>
2425
</annotations>
2526
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2627
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>

0 commit comments

Comments
 (0)