Skip to content

Commit 13ba9d3

Browse files
engcom-Hotelengcom-Hotel
authored
Merge branch 'develop' into fixes-issue-775
2 parents defaea9 + fc6c7a3 commit 13ba9d3

File tree

15 files changed

+24
-31
lines changed

15 files changed

+24
-31
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ For more detailed information on contribution please read our [beginners guide](
2121
1. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
2222
1. PRs which include new logic or new features must be submitted along with:
2323
* Unit/integration test coverage
24-
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
24+
* Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
2525
1. For larger features or changes, please [open an issue](https://github.com/magento/magento2-page-builder/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
2626

2727
## Contribution process

‎app/code/Magento/AwsS3PageBuilder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Aws S3 Page Builder module",
44
"require": {
55
"magento/framework": "*",
6-
"php": "~8.1.0||~8.2.0"
6+
"php": "~8.1.0||~8.2.0||~8.3.0"
77
},
88
"suggest": {
99
"magento/module-page-builder": "*",

‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-catalog": "*",
1010
"magento/framework": "*",
11-
"php": "~8.1.0||~8.2.0"
11+
"php": "~8.1.0||~8.2.0||~8.3.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/CmsPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-cms": "*",
1010
"magento/framework": "*",
11-
"php": "~8.1.0||~8.2.0"
11+
"php": "~8.1.0||~8.2.0||~8.3.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,18 +200,18 @@
200200
<data key="section">background</data>
201201
<data key="fieldName">background_color</data>
202202
<data key="value">#804042</data>
203-
<data key="rgb">rgb(128, 64, 64)</data>
204-
<data key="hex">#804040</data>
203+
<data key="rgb">rgb(126, 63, 63)</data>
204+
<data key="hex">#7e3f3f</data>
205205
</entity>
206206
<entity name="PageBuilderBackgroundColor_CenterColorHueSlider" type="pagebuilder_background_color_property">
207207
<data key="name">Background Color</data>
208208
<data key="section">background</data>
209209
<data key="fieldName">background_color</data>
210210
<data key="value">#40807f</data>
211-
<data key="rgb">rgb(64, 128, 127)</data>
212-
<data key="hex">#40807f</data>
211+
<data key="rgb">rgb(63, 123, 126)</data>
212+
<data key="hex">#3f7b7e</data>
213213
<data key="rgbaCenterOfLightDarkSlider">rgba(64, 128, 127, 0.5)</data>
214-
<data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*128,\s*127,\s*0.49(\d+)\)</data>
214+
<data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(63,\s*123,\s*126,\s*0.49(\d+)\)</data>
215215
</entity>
216216
<entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
217217
<data key="name">Background Color</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<group value="pagebuilder-cms-page"/>
2222
<group value="pr_exclude"/>
2323
<group value="cloud"/>
24+
<skip><issueId value="AC-10534"/></skip>
2425
</annotations>
2526
<before>
2627
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -42,6 +43,9 @@
4243
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4344
<argument name="contentType" value="PageBuilderRowContentType"/>
4445
</actionGroup>
46+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow">
47+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
48+
</actionGroup>
4549
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
4650
<argument name="property" value="PageBuilderBackgroundColor_HSV_Orange"/>
4751
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<waitForPageLoad stepKey="waitForAttributeSetGrid"/>
129129
<click selector="{{AdminProductAttributeSetGridSection.AttributeSetName('Default')}}" stepKey="navigateToDefaultAttributeSet"/>
130130
<waitForPageLoad stepKey="waitForAttributeSetEditPage"/>
131-
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute1.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('weight')}}" stepKey="dragFirstAttributeToWeight"/>
131+
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute1.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('price')}}" stepKey="dragFirstAttributeToWeight"/>
132132
<waitForPageLoad stepKey="waitForDragAndDrop"/>
133133
<dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute2.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('status')}}" stepKey="dragSecondAttributeToStatus"/>
134134
<waitForPageLoad stepKey="waitForDragAndDrop2"/>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
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>
2522
</annotations>
2623
<before>
2724
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -88,7 +85,6 @@
8885
</actionGroup>
8986
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
9087
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
91-
<!-- -->
9288
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
9389
<wait time="5" stepKey="pauseAfterIconHover"/>
9490
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-common"/>
2121
<group value="pagebuilder-banner"/>
22-
<skip>
23-
<issueId value="ACQE-3836">Skipped</issueId>
24-
</skip>
22+
<group value="pr_exclude" />
2523
</annotations>
2624
<before>
2725
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationValidateProductTotalsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<argument name="property" value="PageBuilderProductsSortByNewestTop"/>
160160
</actionGroup>
161161
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel5">
162-
<argument name="productsTotals" value="of 1 total"/>
162+
<argument name="productsTotals" value="of 7 total"/>
163163
</actionGroup>
164164
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel5"/>
165165
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage5">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="BLOCKER"/>
1818
<useCaseId value="MC-18071"/>
1919
<testCaseId value="MC-19606"/>
20-
<skip>
21-
<issueId value="MQE-3442"/>
22-
</skip>
2320
<group value="pagebuilder"/>
2421
<group value="pagebuilder-layout"/>
2522
<group value="pagebuilder-fullwidth"/>
@@ -72,12 +69,10 @@
7269
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openCreatedProductPage">
7370
<argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
7471
</actionGroup>
75-
<!-- Click on reviews and add review with current user -->
76-
<scrollTo selector="{{StorefrontProductReviewsSection.startRating('1','5')}}" x="-200" y="-200" stepKey="scrollToQuality"/>
77-
<clickWithLeftButton selector="{{StorefrontProductReviewsSection.startRating('1','5')}}" x="75" y="0" stepKey="clickButton1"/>
78-
<clickWithLeftButton selector="{{StorefrontProductReviewsSection.startRating('2','5')}}" x="75" y="0" stepKey="clickButton2"/>
79-
<clickWithLeftButton selector="{{StorefrontProductReviewsSection.startRating('3','5')}}" x="75" y="0" stepKey="clickButton3"/>
80-
72+
<comment userInput="BIC workaround" stepKey="scrollToQuality"/>
73+
<comment userInput="BIC workaround" stepKey="clickButton1"/>
74+
<comment userInput="BIC workaround" stepKey="clickButton2"/>
75+
<comment userInput="BIC workaround" stepKey="clickButton3"/>
8176
<actionGroup ref="StorefrontAddProductReviewProductFullWidthLayoutActionGroup" stepKey="addReview"/>
8277
<!-- Go to "Pending reviews" page and clear filters -->
8378
<actionGroup ref="AdminOpenPendingReviewsPageActionGroup" stepKey="openReviewsPage"/>

‎app/code/Magento/PageBuilder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"magento/module-wishlist": "*",
2222
"magento/module-require-js": "*",
2323
"magento/module-media-storage": "*",
24-
"php": "~8.1.0||~8.2.0",
24+
"php": "~8.1.0||~8.2.0||~8.3.0",
2525
"phpgt/dom": "^2.2"
2626
},
2727
"suggest": {

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
<with args="stage">
3232
<render></render>
3333
</with>
34-
<iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts" style="position: absolute; width:0; height:0; border: none;"></iframe>
34+
<iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts allow-same-origin" style="position: absolute; width:0; height:0; border: none;"></iframe>
3535
</if>
3636
</div>

‎app/code/Magento/PageBuilderAdminAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require": {
88
"magento/framework": "*",
9-
"php": "~8.1.0||~8.2.0"
9+
"php": "~8.1.0||~8.2.0||~8.3.0"
1010
},
1111
"suggest": {
1212
"magento/module-admin-analytics": "*",

‎app/code/Magento/PageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"magento/module-analytics": "*",
66
"magento/module-page-builder": "*",
77
"magento/framework": "*",
8-
"php": "~8.1.0||~8.2.0"
8+
"php": "~8.1.0||~8.2.0||~8.3.0"
99
},
1010
"type": "magento2-module",
1111
"license": [

0 commit comments

Comments
 (0)