Skip to content

Commit

Permalink
Version 1.7.1-p11
Browse files Browse the repository at this point in the history
  • Loading branch information
magento packaging service committed Oct 3, 2024
1 parent 20139ba commit 8753eef
Show file tree
Hide file tree
Showing 146 changed files with 398 additions and 157 deletions.
16 changes: 9 additions & 7 deletions app/code/Magento/AwsS3PageBuilder/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -22,3 +23,4 @@
}
}
}

16 changes: 9 additions & 7 deletions app/code/Magento/CatalogPageBuilderAnalytics/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -23,3 +24,4 @@
}
}
}

16 changes: 9 additions & 7 deletions app/code/Magento/CmsPageBuilderAnalytics/composer.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -23,3 +24,4 @@
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
$config->addData(
[
'tinymce' => [
'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
'toolbar' => 'undo redo | styles | fontsizeselect | lineheight | forecolor backcolor ' .
'| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
'| link image table charmap',

Expand All @@ -55,9 +55,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
'link',
'charmap',
'media',
'noneditable',
'table',
'paste',
'code',
'help',
'table',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
<arguments>
<argument name="block" defaultValue="BlockOnStorefront"/>
Expand All @@ -15,8 +15,8 @@
<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"/>
<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<executeJS function="return Math.round(window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) * {{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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
<element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
<element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='URL']"/>
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
<element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
<element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
<element name="targetInput" type="input" selector="button[title='Open link in...']"/>
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
<element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
<element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
<element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
<element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
<element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
<element name="formatOption" type="text" parameterized="true" selector="//div[contains(@class, 'mce-menu')]//span[contains(@class, 'mce-text') and text()='{{label}}']"/>
</section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="TinyMCESection">
<element name="Style" type="button" selector="button[title='Formats']"/>
<element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageCenter"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageCenter"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageCenter"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageCenter"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="setAppearance">
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageLeft"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageLeft"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageLeft"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageLeft"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="setAppearance">
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -85,7 +88,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 -->
Expand All @@ -100,7 +106,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>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageRight"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageRight"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageRight"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<group value="pagebuilder-bannerCollageRight"/>
<group value="pagebuilder-backgroundForm"/>
<group value="pagebuilder-video-background"/>
<group value="pr_exclude"/>
</annotations>
<actionGroup ref="chooseVisualSelectOption" stepKey="setAppearance">
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
Expand Down
Loading

0 comments on commit 8753eef

Please sign in to comment.