Skip to content

Commit

Permalink
Version 1.7.3-p9
Browse files Browse the repository at this point in the history
  • Loading branch information
magento packaging service committed Feb 7, 2025
1 parent 94f5e14 commit 73de79f
Show file tree
Hide file tree
Showing 243 changed files with 476 additions and 308 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.3",
"require": {
"magento/framework": "*",
"magento/framework": "103.0.*",
"php": "~8.1.0||~8.2.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.3",
"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": "~8.1.0||~8.2.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.3",
"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": "~8.1.0||~8.2.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 @@ -12,7 +12,7 @@
<argument name="index" defaultValue="0" type="string"/>
</arguments>
<executeJS function="return document.querySelectorAll('[data-content-type=row]')[{{index}}].clientWidth" stepKey="rowWidth"/>
<executeJS function="return document.querySelector('[class=page-wrapper]').clientWidth" stepKey="pageWidth"/>
<executeJS function="return document.querySelector('main#maincontent').clientWidth" stepKey="pageWidth"/>
<assertEquals stepKey="assertRowWidth100Percent">
<expectedResult type="variable">pageWidth</expectedResult>
<actualResult type="variable">rowWidth</actualResult>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
</assertRegExp>
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
<waitForElementVisible selector="{{section.backgroundMobileImage(index, backgroundMobileImage.fileName)}}" stepKey="waitForBackgroundMobileImageVisible"/>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<argument name="index" defaultValue="1" type="string"/>
</arguments>
<comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
<resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
<resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
<executeJS function="return {{pageOrStageWidthJS}}" stepKey="pageOrStageWidth"/>
<executeJS function="return {{section.rowWidthJS(index)}}" stepKey="rowWidth"/>
<assertGreaterThan stepKey="assertRowWidthGreaterThanZero">
Expand All @@ -25,6 +25,6 @@
<expectedResult type="variable">pageOrStageWidth</expectedResult>
<actualResult type="variable">rowWidth</actualResult>
</assertLessThan>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<argument name="affordanceValue" defaultValue="0" type="string"/>
</arguments>
<comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
<resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
<resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
<executeJS function="return {{pageOrStageWidthJS}} - {{affordanceValue}}" stepKey="pageOrStageWidth"/>
<executeJS function="return {{section.rowWidthJS(rowIndex)}}" stepKey="rowWidth"/>
<executeJS function="return parseInt({{section.rowChildContentWidthJS(rowIndex, childContentType.role, childContentTypeIndex)}} + {{padding.paddingLeft}} + {{padding.paddingRight}} + ({{childContentTypeBorder.value}}*2))" stepKey="rowChildElementWidth"/>
Expand All @@ -41,6 +41,6 @@
<expectedResult type="int">1300</expectedResult>
<actualResult type="variable">rowChildElementWidth</actualResult>
</assertLessThanOrEqual>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<executeJS function="return parseInt({$columnWidth} - {{columnPadding.paddingLeft}} - {{columnPadding.paddingRight}} - ({{columnBorderWidth.value}} * 2))" stepKey="expectedElementWidth"/>
<executeJS function="return Math.abs({$expectedElementWidth} - {$elementWidth})" stepKey="elementDiff"/>
<!-- We will allow a 2px offset to account for rounding and any additional threshold that is passed in as an argument -->
<executeJS function="return parseInt({{diffThreshold}} + 2)" stepKey="acceptableOffset"/>
<executeJS function="return parseInt({{diffThreshold}} + 4)" stepKey="acceptableOffset"/>
<assertLessThanOrEqual stepKey="assertElementWidthEqualsColumnWidthLessPaddingAndBorder">
<expectedResult type="variable">acceptableOffset</expectedResult>
<actualResult type="variable">elementDiff</actualResult>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<element name="textArea" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//textarea[contains(@class,'inline-wysiwyg-textarea')]" parameterized="true"/>
<element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Text')]" parameterized="true"/>
<element name="textPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
<element name="tinymceInFocus" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg') and contains(@class, 'mce-edit-focus')]" parameterized="true"/>
<element name="importantStyle" type="text" selector="//span[text()='Important']"/>
<element name="textInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg2}}']" parameterized="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<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[@title='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...']"/>
Expand Down
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[title='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[title='{{label}}']"/>
<element name="HeadSelector" type="text" selector="div[title='Headings']"/>
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[title='Format Paragraph']"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<after>
<!-- Delete Data -->
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

<after>
<!-- Delete Data -->
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
<deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
<deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<after>
<!-- Delete Data & Revert Attribute -->
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
<deleteData createDataKey="createProduct1" stepKey="deleteCreatedProduct1"/>
<deleteData createDataKey="createProduct2" stepKey="deleteCreatedProduct2"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_GIF.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_JPG.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_JPG.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_JPG.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_PNG.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_SpecialCharacters.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</actionGroup>
</before>
<after>
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
<resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
Expand Down
Loading

0 comments on commit 73de79f

Please sign in to comment.