Version 1.7.2-p6

magento · Feb 8, 2024 · 3320cc7 · 3320cc7
1 parent d1bdaf5
commit 3320cc7
Show file tree

Hide file tree

Showing 33 changed files with 254 additions and 156 deletions.
diff --git a/app/code/Magento/AwsS3PageBuilder/composer.json b/app/code/Magento/AwsS3PageBuilder/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-aws-s3-page-builder",
     "description": "Aws S3 Page Builder module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "version": "1.0.2",
     "require": {
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "php": "~7.4.0||~8.1.0"
     },
     "suggest": {
-        "magento/module-page-builder": "*",
-        "magento/module-aws-s3": "*"
+        "magento/module-page-builder": "2.2.*",
+        "magento/module-aws-s3": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-catalog-page-builder-analytics",
     "description": "Catalog Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "1.6.2",
     "require": {
-        "magento/module-page-builder-analytics": "*",
-        "magento/module-catalog": "*",
-        "magento/framework": "*",
+        "magento/module-page-builder-analytics": "1.6.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/framework": "103.0.*",
         "php": "~7.4.0||~8.1.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/composer.json b/app/code/Magento/CmsPageBuilderAnalytics/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-cms-page-builder-analytics",
     "description": "CMS Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "1.6.2",
     "require": {
-        "magento/module-page-builder-analytics": "*",
-        "magento/module-cms": "*",
-        "magento/framework": "*",
+        "magento/module-page-builder-analytics": "1.6.*",
+        "magento/module-cms": "104.0.*",
+        "magento/framework": "103.0.*",
         "php": "~7.4.0||~8.1.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/...tionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml b/...tionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml
@@ -6,20 +6,20 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="verifyVerticalAlignmentCenterInBlock">
-        <arguments>
-            <argument name="block" defaultValue="BlockOnStorefront"/>
-            <argument name="container"/>
-            <argument name="containerIndex" defaultValue="1" type="string"/>
-            <argument name="content"/>
-            <argument name="contentIndex" defaultValue="1" type="string"/>
-        </arguments>
-        <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"/>
-        <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"/>
-        <assertEquals stepKey="assertBottomPosition">
-            <expectedResult type="variable">containerCenter</expectedResult>
-            <actualResult type="variable">contentCenter</actualResult>
-        </assertEquals>
-    </actionGroup>
-</actionGroups>
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+  <actionGroup name="verifyVerticalAlignmentCenterInBlock">
+    <arguments>
+      <argument name="block" defaultValue="BlockOnStorefront"/>
+      <argument name="container"/>
+      <argument name="containerIndex" defaultValue="1" type="string"/>
+      <argument name="content"/>
+      <argument name="contentIndex" defaultValue="1" type="string"/>
+    </arguments>
+    <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"/>
+    <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"/>
+    <assertEquals stepKey="assertBottomPosition">
+      <expectedResult type="variable">containerCenter</expectedResult>
+      <actualResult type="variable">contentCenter</actualResult>
+    </assertEquals>
+  </actionGroup>
+</actionGroups>
diff --git a/...der/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml b/...der/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml
@@ -20,8 +20,8 @@
         <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"/>
         <executeJS function="return Math.abs({$grabColumnWidthValue}-{$grabCalculatedColumnWidthValue})" stepKey="columnWidthDifference"/>
         <assertLessThanOrEqual stepKey="assertColumnWidthValue">
-            <expectedResult type="int">2</expectedResult>
+            <expectedResult type="int">3</expectedResult>
             <actualResult type="variable">columnWidthDifference</actualResult>
         </assertLessThanOrEqual>
     </actionGroup>
-</actionGroups>
+</actionGroups>
diff --git a/...Builder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml b/...Builder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml
@@ -6,19 +6,19 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
-        <annotations>
-            <description>Content types expected style equals the computed style</description>
-        </annotations>
-        <arguments>
-            <argument name="selector" type="string"/>
-            <argument name="expectedProperty" type="string"/>
-            <argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
-        </arguments>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
-        <assertEquals stepKey="propertyIsEqualsAsExpected">
-            <expectedResult type="string">{{expectedProperty}}</expectedResult>
-            <actualResult type="variable">fetchedProperty</actualResult>
-        </assertEquals>
-    </actionGroup>
-</actionGroups>
+  <actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
+    <annotations>
+      <description>Content types expected style equals the computed style</description>
+    </annotations>
+    <arguments>
+      <argument name="selector" type="string"/>
+      <argument name="expectedProperty" type="string"/>
+      <argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
+    </arguments>
+    <executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
+    <assertEquals stepKey="propertyIsEqualsAsExpected">
+      <expectedResult type="string">{{expectedProperty}}</expectedResult>
+      <actualResult type="variable">fetchedProperty</actualResult>
+    </assertEquals>
+  </actionGroup>
+</actionGroups>
diff --git a/...dminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml b/...dminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BannerCollageCenterButtonOnHoverTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -85,7 +85,12 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
+        <moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
+        <wait time="5" stepKey="pause2"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +105,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
-        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
+        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerMobileStorefront"/>
+        <wait time="10" stepKey="pause3"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
-</tests>
+</tests>
diff --git a/...st/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml b/...st/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BannerCollageLeftButtonOnHoverTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -85,7 +85,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +103,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="10" stepKey="pause1StorefrontMobile"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
-</tests>
+</tests>
diff --git a/.../AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml b/.../AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BannerCollageRightButtonOnHoverTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -19,6 +19,9 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <skip>
+              <issueId value="ACQE-3837">Skipped</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -85,7 +88,11 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <!--    -->
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +107,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="10" stepKey="pause3"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
-</tests>
+</tests>
diff --git a/...est/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasExpectedFieldsAndDefaultsTest.xml b/...est/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasExpectedFieldsAndDefaultsTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BannerHasExpectedFieldsAndDefaultsTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -111,7 +111,8 @@
         <actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeDefaultMinimumHeightProperty">
             <argument name="property" value="PageBuilderMinHeightProperty_300px"/>
         </actionGroup>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundPositionDropdownValues"/>
+        <scrollTo selector="//div[@data-index='background']/descendant::*[@name='background_position']/option" stepKey="options"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" stepKey="grabBackgroundPositionDropdownValues"/>
         <assertEquals stepKey="assertPositionDropdown" message="Background Position in dropdown">
             <expectedResult type="array">{{PageBuilderBackgroundPosition_Default.optionsList}}</expectedResult>
             <actualResult type="variable">grabBackgroundPositionDropdownValues</actualResult>
@@ -152,4 +153,4 @@
             <argument name="property" value="PageBuilderBannerContentOverlayColorProperty"/>
         </actionGroup>
     </test>
-</tests>
+</tests>
diff --git a/...st/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml b/...st/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BannerPosterButtonOnHoverTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -85,7 +85,12 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
+        <moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
+        <wait time="5" stepKey="pause2"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +105,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideMobileStorefront"/>
+        <wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="10" stepKey="pause3"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
-</tests>
+</tests>