Skip to content

Commit 1c14beb

Browse files
danmooney2danmooney2
committed
Merge remote-tracking branch 'remotes/mainline-bluefoot/develop' into team3-delivery-bug-fixes
2 parents 13bc65e + f3e63d5 commit 1c14beb

File tree

75 files changed

+3352
-570
lines changed

Some content is hidden

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

75 files changed

+3352
-570
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
declare(strict_types=1);
8-
97
namespace Magento\PageBuilder\Model\Wysiwyg;
108

119
/**
@@ -17,12 +15,10 @@ class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigPro
1715
* @var \Magento\Framework\View\Asset\Repository
1816
*/
1917
private $assetRepo;
20-
2118
/**
2219
* @var array
2320
*/
2421
private $additionalSettings;
25-
2622
/**
2723
* @param \Magento\Framework\View\Asset\Repository $assetRepo
2824
* @param array $additionalSettings
@@ -34,7 +30,6 @@ public function __construct(
3430
$this->assetRepo = $assetRepo;
3531
$this->additionalSettings = $additionalSettings;
3632
}
37-
3833
/**
3934
* {@inheritdoc}
4035
*/
@@ -43,7 +38,8 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
4338
$config->addData([
4439
'tinymce4' => [
4540
'toolbar' => 'undo redo | styleselect | fontsizeselect | forecolor backcolor | bold italic underline' .
46-
' | alignleft aligncenter alignright | numlist bullist | link image table charmap | widgets variables',
41+
' | alignleft aligncenter alignright | numlist bullist | link image table charmap' .
42+
' | widgets variables',
4743
'plugins' => implode(
4844
' ',
4945
[

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@
5151
<click selector="{{SliderInAdmin.slideOptionsRemove}}" stepKey="clickRemoveContentType"/>
5252
<wait time="0.5" stepKey="waitForRemovalAnimation" />
5353
</actionGroup>
54+
<actionGroup name="duplicateSlide">
55+
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentBlockInStageVisible" />
56+
<click selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="clickActiveSlideNavigationDot"/>
57+
<seeElement selector="{{SliderInAdmin.slideOptions}}" stepKey="seeContentBlockOptionsMenu"/>
58+
<click selector="{{SliderInAdmin.slideOptionsDuplicate}}" stepKey="clickRemoveContentBlock"/>
59+
</actionGroup>
5460
<actionGroup name="addSlide">
5561
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />
5662
<click stepKey="focusOnSlider" selector="{{SliderInAdmin.sliderContainer}}"/>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@
259259
<data key="name">Show Button</data>
260260
<data key="section">general</data>
261261
<data key="fieldName">show_button</data>
262-
<data key="value">never_show</data>
262+
<data key="value">never</data>
263263
</entity>
264264
<entity name="PageBuilderSlideShowButtonOnHoverProperty" type="pagebuilder_Slide_showButton_property">
265265
<data key="name">Show Button</data>
266266
<data key="section">general</data>
267267
<data key="fieldName">show_button</data>
268-
<data key="value">on_hover</data>
268+
<data key="value">hover</data>
269269
</entity>
270270
<entity name="PageBuilderSlideShowContentOverlayAlwaysProperty" type="pagebuilder_Slide_showContentOverlay_property">
271271
<data key="name">Show Overlay</data>
@@ -277,19 +277,19 @@
277277
<data key="name">Show Overlay</data>
278278
<data key="section">general</data>
279279
<data key="fieldName">show_overlay</data>
280-
<data key="value">on_hover</data>
280+
<data key="value">hover</data>
281281
</entity>
282282
<entity name="PageBuilderSlideShowContentOverlayNeverShowProperty" type="pagebuilder_Slide_showContentOverlay_property">
283283
<data key="name">Show Overlay</data>
284284
<data key="section">general</data>
285285
<data key="fieldName">show_overlay</data>
286-
<data key="value">never_show</data>
286+
<data key="value">never</data>
287287
</entity>
288288
<entity name="PageBuilderSlideShowContentOverlayDefaultProperty" type="pagebuilder_Slide_showContentOverlayDefault_property">
289289
<data key="name">Show Overlay</data>
290290
<data key="section">general</data>
291291
<data key="fieldName">show_overlay</data>
292-
<data key="value">never_show</data>
292+
<data key="value">never</data>
293293
</entity>
294294
<entity name="PageBuilderSlideContentOverlayColorProperty" type="pagebuilder_Slide_contentOverlayColor_property">
295295
<data key="name">Overlay Color</data>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<element name="contentTypeInStageByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]' parameterized="true"/>
5353
<element name="contentTypeContainer" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]/descendant::div[contains(@class, "element-children")]' parameterized="true"/>
5454
<element name="contentTypeInsideContainerStage" type="button" selector='(//div[contains(@class, "{{arg1}}-container")])[{{arg2}}]//div[contains(@class,"pagebuilder-content-type-wrapper")][{{arg3}}]//div[contains(@class,"pagebuilder-{{arg4}}")][{{arg5}}]' parameterized="true"/>
55-
<element name="contentTypeInsideContainerStorefront" type="button" selector='(//div[@class="pagebuilder-{{arg1}}"])[{{arg2}}]//div[@data-role="{{arg3}}"][{{arg4}}]' parameterized="true"/>
55+
<element name="contentTypeInsideContainerStorefront" type="button" selector='(//div[@data-role="{{arg1}}"])[{{arg2}}]//div[@data-role="{{arg3}}"][{{arg4}}]' parameterized="true"/>
5656
<element name="contentTypePreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type" parameterized="true"/>
5757
<element name="contentTypeOptionsMenu" type="button" selector='div.pagebuilder-{{arg1}}.pagebuilder-content-type div.pagebuilder-options' parameterized="true"/>
5858
<element name="contentTypeOptionsMenuByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]//div[contains(@class,"pagebuilder-options-visible")]' parameterized="true"/>
@@ -138,11 +138,11 @@
138138
</section>
139139
<section name="ColorPicker">
140140
<element name="colorSwatch" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),'sp-preview')]"/>
141-
<element name="colorBox" type="button" selector="//div[contains(@class,'sp-palette') and @style]//span[@data-color='{{arg1}}']" parameterized="true"/>
142-
<element name="firstColorBox" type="button" selector="//div[contains(@class,'sp-palette') and @style]//span[@data-color='rgb(252, 0, 9)']"/>
143-
<element name="colorWheel" type="button" selector="//div[contains(@class,'sp-palette') and @style]//div[@class='sp-val']"/>
144-
<element name="applyBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style]//button[text()='Apply']"/>
145-
<element name="cancelBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style]//a[text()='Cancel']"/>
146-
<element name="inputField" type="input" selector="//div[contains(@class,'sp-palette') and @style]//input[@class='sp-input']"/>
141+
<element name="colorBox" type="button" selector="//div[contains(@class,'sp-palette') and @style and not(contains(@class, 'sp-hidden'))]//span[@data-color='{{arg1}}']" parameterized="true"/>
142+
<element name="firstColorBox" type="button" selector="//div[contains(@class,'sp-palette') and @style and not(contains(@class, 'sp-hidden'))]//span[@data-color='rgb(252, 0, 9)']"/>
143+
<element name="colorWheel" type="button" selector="//div[contains(@class,'sp-palette') and @style and not(contains(@class, 'sp-hidden'))]//div[@class='sp-val']"/>
144+
<element name="applyBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style and not(contains(@class, 'sp-hidden'))]//button[text()='Apply']"/>
145+
<element name="cancelBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style and not(contains(@class, 'sp-hidden'))]//a[text()='Cancel']"/>
146+
<element name="inputField" type="input" selector="//div[contains(@class,'sp-palette') and @style and not(contains(@class, 'sp-hidden'))]//input[@class='sp-input']"/>
147147
</section>
148148
</sections>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
</section>
6262
<section name="ColumnsOnFrontend">
6363
<element name="columnGroup" type="block" selector=".pagebuilder-column-group"/>
64-
<element name="allColumns" type="block" selector=".pagebuilder-column-group .pagebuilder-column"/>
65-
<element name="columnX" type="block" selector=".pagebuilder-column-group .pagebuilder-column:nth-child({{arg}})" parameterized="true"/>
64+
<element name="allColumns" type="block" selector="(//div[@data-role='column'])"/>
65+
<element name="columnX" type="block" selector="[data-role=column]:nth-child({{arg1}})" parameterized="true"/>
6666
<element name="columnStyle" type="button" selector="(//div[@data-role='column'])[{{arg1}}][contains(@style, '{{arg2}}')]" parameterized="true"/>
6767
<element name="column1Height" type="button" selector="(//div[@data-role='column'])[1][contains(@style, 'min-height: 500px;')]"/>
6868
<element name="column1HeightFull" type="button" selector="(//div[@data-role='column'])[1][contains(@style, 'align-self: stretch;')]"/>
@@ -93,7 +93,7 @@
9393
<element name="backgroundImageSource" type="button" selector="div[data-role='column'][style*='background-image: url'][style*='{{arg1}}'][style*='.{{arg2}}']" parameterized="true"/>
9494
<element name="columnDisplay" type="button" selector="[data-role='column']:first-child"/>
9595
<element name="columnTextAlign" type="button" selector="[data-role='column']:first-child[style*='text-align: left;']"/>
96-
<element name="columnBorder" type="button" selector="[data-role='column']:first-child[style*='border: 10px dotted rgb(255, 255, 255);']"/>
96+
<element name="columnBorder" type="button" selector="[data-role='column']:first-child[style*='border-style: dotted;'][style*='border-color: rgb(255, 255, 255);'][style*='border-width: 10px;']"/>
9797
<element name="columnBorderRadius" type="button" selector="[data-role='column']:first-child[style*='border-radius: 12px;']"/>
9898
<element name="columnMargin" type="button" selector="[data-role='column']:first-child[style*='margin: 5px;']"/>
9999
<element name="columnPadding" type="button" selector="[data-role='column']:first-child[style*='padding: 5px;']"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<element name="headingTypeToolbarSelected" type="text" selector="(//div[contains(@class,'pagebuilder-heading')])[{{arg1}}]//a[contains(@class, 'toolbar-active')]//span[text()='{{arg2}}']" parameterized="true"/>
2121
<element name="headingTextAlignToolbar" type="button" selector="(//div[contains(@class,'pagebuilder-heading')])[{{arg1}}]//i[contains(@class,'icon-pagebuilder-align-{{arg2}}')]" parameterized="true"/>
2222
<element name="headingTextAlignToolbarSelected" type="button" selector="(//div[contains(@class,'pagebuilder-heading')])[{{arg1}}]//a[contains(@class, 'toolbar-active')]//i[contains(@class,'icon-pagebuilder-align-{{arg2}}')]" parameterized="true"/>
23+
<element name="headingToolbarButtonViewportPositionTop" type="button" selector="return document.querySelector('.pagebuilder-toolbar-options-wrapper ul:{{arg1}}-child li:{{arg1}}-child').getBoundingClientRect().top;" parameterized="true"/>
2324
<!-- Advanced Configuration -->
2425
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-heading')]//{{arg1}})[{{arg2}}][contains(@style,'text-align: {{arg3}};')]" parameterized="true"/>
2526
<element name="noAlignment" type="text" selector="(//{{arg1}})[{{arg2}}][not(contains(@style,'text-align:'))]" parameterized="true"/>

0 commit comments

Comments
 (0)