Skip to content

Commit 979c959

Browse files
engcom-Hotelengcom-Hotel
authored
Merge branch 'develop' into comm_743
2 parents d8b1270 + 60140cd commit 979c959

File tree

58 files changed

+1192
-158
lines changed

Some content is hidden

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

58 files changed

+1192
-158
lines changed

‎.github/.metadata.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"templateVersion": "0.1",
2+
"templateVersion": "0.2",
33
"product": {
44
"name": "Magento 2 Page Builder",
55
"description": "Page Builder introduces an intuitive, drag-and-drop interface for creating digital content, powered by content types like images, videos, banners, etc. with instant preview capabilities that enable non-technical users to take control of their content."
66
},
77
"contacts": {
88
"team": {
9-
"name": "Amigos",
10-
"DL": "Grp-amigos",
11-
"slackChannel": "team-amigos"
9+
"name": "Bluetooth",
10+
"DL": "Grp-RQ-BLUETOOTH",
11+
"slackChannel": ""
1212
}
1313
},
1414
"ticketTracker": {
1515
"functionalJiraQueue": {
16-
"projectKey": "PB",
16+
"projectKey": "AC",
1717
"component": ""
1818
},
1919
"securityJiraQueue": {

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml renamed to ‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageAwsS3Test.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Block/GoogleMapsApi.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
*/
1717
class GoogleMapsApi extends \Magento\Framework\View\Element\Template
1818
{
19-
const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
20-
const GOOGLE_MAPS_LIBRARY_URL = 'https://maps.googleapis.com/maps/api/js?v=3&key=%s';
21-
const GOOGLE_MAPS_STYLE_PATH = 'cms/pagebuilder/google_maps_style';
19+
public const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
20+
public const GOOGLE_MAPS_LIBRARY_URL = 'https://maps.googleapis.com/maps/api/js?v=3.56&key=%s';
21+
public const GOOGLE_MAPS_STYLE_PATH = 'cms/pagebuilder/google_maps_style';
2222

2323
/**
2424
* Retrieve the Google Maps API key

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsSameSizeActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<argument name="firstButtonIndex" defaultValue="1" type="string"/>
1616
<argument name="secondButtonIndex" defaultValue="2" type="string"/>
1717
</arguments>
18+
<waitForPageLoad stepKey="waitForPageLoadToAssert"/>
1819
<comment userInput="validateButtonItemsSameSize" stepKey="comment"/>
1920
<waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupIndex)}}" stepKey="waitForButtonGroup"/>
2021
<seeElement selector="{{buttonGroupPage.sameSizeValue(buttonGroupIndex, PageBuilderButtonGroupSameSize_Enabled.value)}}" stepKey="seeButtonSameSizeValue"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="property"/>
1313
</arguments>
14-
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
14+
<waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
1515
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
1616
<seeElementInDOM selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="seePropertyControl"/>
1717
</actionGroup>

‎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.panelFieldControlWithUploaderId(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/ActionGroup/WYSIWYGActionGroup/AdminOpenInsertWidgetSlideOutActionGroup.xml renamed to ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetButtonInInlineTinyMCEEditorActionGroup.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTextActionGroup.xml renamed to ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/clickOutsideTextInlineEditingActionGroup.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@
6464
<data key="extension">jpg</data>
6565
<data key="path">wysiwyg</data>
6666
</entity>
67+
<entity name="PageBuilderImagePropertyJpgCopyOtherFolder" type="pagebuilder_image_property">
68+
<data key="name">Image</data>
69+
<data key="section">general</data>
70+
<data key="fieldName">image</data>
71+
<data key="value">magento.jpg</data>
72+
<data key="file">duplicatesamename/magento.jpg</data>
73+
<data key="fileName">magento</data>
74+
<data key="extension">jpg</data>
75+
<data key="path">wysiwyg</data>
76+
</entity>
6777
<entity name="PageBuilderBackgroundImagePropertyJpg" type="pagebuilder_image_property">
6878
<data key="name">Image</data>
6979
<data key="section">background</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757
<data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
5858
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
5959
</entity>
60+
<entity name="PageBuilderVideoUrl_YouTube_Nocookie" type="pagebuilder_video_url_property">
61+
<data key="name">Video URL</data>
62+
<data key="section">general</data>
63+
<data key="fieldName">video_source</data>
64+
<data key="value">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
65+
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
66+
</entity>
6067
<entity name="PageBuilderVideoUrl_Vimeo_Embedded" type="pagebuilder_video_url_property">
6168
<data key="name">Video URL</data>
6269
<data key="section">general</data>

0 commit comments

Comments
 (0)