Skip to content

Commit c113689

Browse files
dvoskoboinikovdvoskoboinikov
authored
Merge pull request #188 from magento-cia/2.4.6-develop-2.4-develop-sync-081122
Sync of 2.4.6-develop with 2.4-develop
2 parents 37495a1 + 102fc9b commit c113689

File tree

27 files changed

+281
-154
lines changed

27 files changed

+281
-154
lines changed

‎app/code/Magento/PageBuilder/Plugin/Catalog/Model/Product/Attribute/RepositoryPlugin.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ public function beforeSave(
3636
\Magento\Catalog\Model\Product\Attribute\Repository $subject,
3737
\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
3838
) {
39-
$isPageBuilderEnabled = $attribute->getData('extension_attributes')
40-
? $attribute->getData('extension_attributes')->getIsPagebuilderEnabled()
39+
$extensionAttributes = $attribute->getData('extension_attributes');
40+
$isPageBuilderEnabled = ($extensionAttributes && method_exists($extensionAttributes, 'getIsPagebuilderEnabled'))
41+
? $extensionAttributes->getIsPagebuilderEnabled()
4142
: 0;
4243
$attribute->setData('is_pagebuilder_enabled', $isPageBuilderEnabled);
4344
}
@@ -58,7 +59,11 @@ public function afterGet(
5859
$extensionAttribute = $result->getExtensionAttributes()
5960
? $result->getExtensionAttributes()
6061
: $this->extensionAttributesFactory->create();
61-
$extensionAttribute->setIsPagebuilderEnabled($isPageBuilderEnabled);
62+
63+
if (method_exists($extensionAttribute, 'setIsPagebuilderEnabled')) {
64+
$extensionAttribute->setIsPagebuilderEnabled($isPageBuilderEnabled);
65+
}
66+
6267
$result->setExtensionAttributes($extensionAttribute);
6368
return $result;
6469
}

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
11-
<arguments>
12-
<argument name="block" defaultValue="BlockOnStorefront"/>
13-
<argument name="container"/>
14-
<argument name="containerIndex" defaultValue="1" type="string"/>
15-
<argument name="content"/>
16-
<argument name="contentIndex" defaultValue="1" type="string"/>
17-
</arguments>
18-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top" stepKey="containerCenter"/>
19-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top" stepKey="contentCenter"/>
20-
<assertEquals stepKey="assertBottomPosition">
21-
<expectedResult type="variable">containerCenter</expectedResult>
22-
<actualResult type="variable">contentCenter</actualResult>
23-
</assertEquals>
24-
</actionGroup>
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
11+
<arguments>
12+
<argument name="block" defaultValue="BlockOnStorefront"/>
13+
<argument name="container"/>
14+
<argument name="containerIndex" defaultValue="1" type="string"/>
15+
<argument name="content"/>
16+
<argument name="contentIndex" defaultValue="1" type="string"/>
17+
</arguments>
18+
<executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top)" stepKey="containerCenter"/>
19+
<executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top)" stepKey="contentCenter"/>
20+
<assertEquals stepKey="assertBottomPosition">
21+
<expectedResult type="variable">containerCenter</expectedResult>
22+
<actualResult type="variable">contentCenter</actualResult>
23+
</assertEquals>
24+
</actionGroup>
2525
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<executeJS function="return Math.round((window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) - 30)* {{columnWidth}})" stepKey="grabCalculatedColumnWidthValue"/>
2121
<executeJS function="return Math.abs({$grabColumnWidthValue}-{$grabCalculatedColumnWidthValue})" stepKey="columnWidthDifference"/>
2222
<assertLessThanOrEqual stepKey="assertColumnWidthValue">
23-
<expectedResult type="int">2</expectedResult>
23+
<expectedResult type="int">3</expectedResult>
2424
<actualResult type="variable">columnWidthDifference</actualResult>
2525
</assertLessThanOrEqual>
2626
</actionGroup>

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9-
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
10-
<annotations>
11-
<description>Content types expected style equals the computed style</description>
12-
</annotations>
13-
<arguments>
14-
<argument name="selector" type="string"/>
15-
<argument name="expectedProperty" type="string"/>
16-
<argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
17-
</arguments>
18-
<executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
19-
<assertEquals stepKey="propertyIsEqualsAsExpected">
20-
<expectedResult type="string">{{expectedProperty}}</expectedResult>
21-
<actualResult type="variable">fetchedProperty</actualResult>
22-
</assertEquals>
23-
</actionGroup>
9+
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
10+
<annotations>
11+
<description>Content types expected style equals the computed style</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="selector" type="string"/>
15+
<argument name="expectedProperty" type="string"/>
16+
<argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
17+
</arguments>
18+
<executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
19+
<assertEquals stepKey="propertyIsEqualsAsExpected">
20+
<expectedResult type="string">{{expectedProperty}}</expectedResult>
21+
<actualResult type="variable">fetchedProperty</actualResult>
22+
</assertEquals>
23+
</actionGroup>
2424
</actionGroups>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@
8585
</actionGroup>
8686
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8787
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
88+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
89+
<wait time="5" stepKey="pauseAfterIconHover"/>
8890
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
91+
<wait time="10" stepKey="pause1"/>
92+
<moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
93+
<wait time="5" stepKey="pause2"/>
8994
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9095
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9196
<!-- Validate Storefront Mobile -->
@@ -100,7 +105,10 @@
100105
</actionGroup>
101106
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102107
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
103-
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
108+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
109+
<wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
110+
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerMobileStorefront"/>
111+
<wait time="10" stepKey="pause3"/>
104112
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105113
</test>
106114
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@
8585
</actionGroup>
8686
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8787
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
88+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
89+
<wait time="5" stepKey="pauseAfterIconHover"/>
8890
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
91+
<wait time="10" stepKey="pause1"/>
8992
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9093
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9194
<!-- Validate Storefront Mobile -->
@@ -100,7 +103,10 @@
100103
</actionGroup>
101104
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102105
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
106+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
107+
<wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
103108
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
109+
<wait time="10" stepKey="pause1StorefrontMobile"/>
104110
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105111
</test>
106112
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-bannerCollageRight"/>
22+
<skip>
23+
<issueId value="ACQE-3837">Skipped</issueId>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -85,7 +88,11 @@
8588
</actionGroup>
8689
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8790
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
91+
<!-- -->
92+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
93+
<wait time="5" stepKey="pauseAfterIconHover"/>
8894
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
95+
<wait time="10" stepKey="pause1"/>
8996
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9097
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9198
<!-- Validate Storefront Mobile -->
@@ -100,7 +107,10 @@
100107
</actionGroup>
101108
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102109
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
110+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
111+
<wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
103112
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
113+
<wait time="10" stepKey="pause3"/>
104114
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105115
</test>
106116
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasExpectedFieldsAndDefaultsTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@
111111
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeDefaultMinimumHeightProperty">
112112
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
113113
</actionGroup>
114-
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundPositionDropdownValues"/>
114+
<scrollTo selector="//div[@data-index='background']/descendant::*[@name='background_position']/option" stepKey="options"/>
115+
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" stepKey="grabBackgroundPositionDropdownValues"/>
115116
<assertEquals stepKey="assertPositionDropdown" message="Background Position in dropdown">
116117
<expectedResult type="array">{{PageBuilderBackgroundPosition_Default.optionsList}}</expectedResult>
117118
<actualResult type="variable">grabBackgroundPositionDropdownValues</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonNeverShowTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<severity value="BLOCKER"/>
1717
<useCaseId value="MAGETWO-83553"/>
1818
<testCaseId value="MC-2692"/>
19-
<group value="pagebuilder"/>
19+
<group value="pagebuilder"/>
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-bannerPoster"/>
2222
</annotations>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@
8585
</actionGroup>
8686
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8787
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
88+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
89+
<wait time="5" stepKey="pauseAfterIconHover"/>
8890
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
91+
<wait time="10" stepKey="pause1"/>
92+
<moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
93+
<wait time="5" stepKey="pause2"/>
8994
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9095
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9196
<!-- Validate Storefront Mobile -->
@@ -100,7 +105,10 @@
100105
</actionGroup>
101106
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102107
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
108+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideMobileStorefront"/>
109+
<wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
103110
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
111+
<wait time="10" stepKey="pause3"/>
104112
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105113
</test>
106114
</tests>

0 commit comments

Comments
 (0)