Skip to content

Commit b4d362b

Browse files
Merge branch '559_no-predefined-gutters' of github.com:bluemwhitew/magento2-page-builder into PR-bundle
2 parents 8503ab8 + c767f46 commit b4d362b

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
<actualResult type="variable">button1Width</actualResult>
2828
<expectedResult type="int">0</expectedResult>
2929
</assertGreaterThan>
30-
<assertEquals stepKey="assertButtonWidthSize">
31-
<actualResult type="variable">button1Width</actualResult>
32-
<expectedResult type="variable">button2Width</expectedResult>
33-
</assertEquals>
30+
<executeJS function="return Math.abs({$button1Width}-{$button2Width})" stepKey="buttonsWidthDifference"/>
31+
<assertLessThanOrEqual stepKey="assertButtonWidthSize">
32+
<actualResult type="variable">buttonsWidthDifference</actualResult>
33+
<expectedResult type="int">1</expectedResult>
34+
</assertLessThanOrEqual>
3435
</actionGroup>
3536
</actionGroups>

app/code/Magento/PageBuilder/etc/di.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@
351351
<argument name="allowedTags" xsi:type="array">
352352
<item name="iframe" xsi:type="string">iframe</item>
353353
<item name="style" xsi:type="string">style</item>
354+
<item name="pre" xsi:type="string">pre</item>
354355
</argument>
355356
<argument name="allowedAttributes" xsi:type="array">
356357
<item name="alt" xsi:type="string">alt</item>
@@ -361,6 +362,8 @@
361362
<item name="data-autoplay-speed" xsi:type="string">data-autoplay-speed</item>
362363
<item name="data-background-images" xsi:type="string">data-background-images</item>
363364
<item name="data-background-type" xsi:type="string">data-background-type</item>
365+
<item name="data-carousel-mode" xsi:type="string">data-carousel-mode</item>
366+
<item name="data-center-padding" xsi:type="string">data-center-padding</item>
364367
<item name="data-content-type" xsi:type="string">data-content-type</item>
365368
<item name="data-element" xsi:type="string">data-element</item>
366369
<item name="data-enable-parallax" xsi:type="string">data-enable-parallax</item>
@@ -379,6 +382,11 @@
379382
<item name="data-show-dots" xsi:type="string">data-show-dots</item>
380383
<item name="data-show-overlay" xsi:type="string">data-show-overlay</item>
381384
<item name="data-slide-name" xsi:type="string">data-slide-name</item>
385+
<item name="data-slick-index" xsi:type="string">data-slick-index</item>
386+
<item name="data-role" xsi:type="string">data-role</item>
387+
<item name="data-product-id" xsi:type="string"> data-product-id</item>
388+
<item name="data-price-box" xsi:type="string">data-price-box</item>
389+
<item name="aria-hidden" xsi:type="string">aria-hidden</item>
382390
<item name="data-tab-name" xsi:type="string">data-tab-name</item>
383391
<item name="data-video-fallback-src" xsi:type="string">data-video-fallback-src</item>
384392
<item name="data-video-lazy-load" xsi:type="string">data-video-lazy-load</item>
@@ -395,7 +403,9 @@
395403
</argument>
396404
<argument name="attributesAllowedByTags" xsi:type="array">
397405
<item name="a" xsi:type="array">
406+
<item name="tabindex" xsi:type="string">tabindex</item>
398407
<item name="target" xsi:type="string">target</item>
408+
<item name="rel" xsi:type="string">rel</item>
399409
</item>
400410
<item name="iframe" xsi:type="array">
401411
<item name="allowfullscreen" xsi:type="string">allowfullscreen</item>

0 commit comments

Comments
 (0)