Skip to content

Commit 2e918aa

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch 'develop' into ds_fix-docs
2 parents c2558d5 + 78b3a4e commit 2e918aa

File tree

6 files changed

+813
-10
lines changed

6 files changed

+813
-10
lines changed

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-allowlist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ImageAddImageContentTypeToCMSPageTest
2+
ImageAddImageIntoPageBuilderStageTest
3+
ImageInvalidFileTypeValidationTest
4+
ImageRemoveImageFromStageTest
5+
PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory
6+
PageBuilderDeleteTemplate
7+
PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut
8+
CanAddVideoToColumnTest

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-errors-detailed

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
2+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml"
3+
contains entity references that violate dependency constraints:
4+
5+
ImageAddImageContentTypeToCMSPageTest from module(s): magento/module-page-builder
6+
7+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml"
8+
contains entity references that violate dependency constraints:
9+
10+
ImageAddImageIntoPageBuilderStageTest from module(s): magento/module-page-builder
11+
12+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml"
13+
contains entity references that violate dependency constraints:
14+
15+
ImageInvalidFileTypeValidationTest from module(s): magento/module-page-builder
16+
17+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml"
18+
contains entity references that violate dependency constraints:
19+
20+
ImageRemoveImageFromStageTest from module(s): magento/module-page-builder
21+
22+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml"
23+
contains entity references that violate dependency constraints:
24+
25+
PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory from module(s): magento/module-page-builder
26+
27+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml"
28+
contains entity references that violate dependency constraints:
29+
30+
PageBuilderDeleteTemplate from module(s): magento/module-page-builder
31+
32+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml"
33+
contains entity references that violate dependency constraints:
34+
35+
PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut from module(s): magento/module-banner-page-builder, magento/module-page-builder
36+
37+
File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml"
38+
contains entity references that violate dependency constraints:
39+
40+
CanAddVideoToColumnTest from module(s): magento/module-page-builder

‎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/Test/Mftf/test-dependency-allowlist

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
AdminMediaGalleryFolderData
2+
ImageMetadata
3+
AdminOpenStandaloneMediaGalleryActionGroup
4+
AdminMediaGalleryFolderSelectActionGroup
5+
AdminMediaGalleryOpenNewFolderFormActionGroup
6+
AdminMediaGalleryCreateNewFolderActionGroup
7+
AdminEnhancedMediaGalleryUploadImageActionGroup
8+
AdminMediaGalleryFolderDeleteActionGroup
9+
AdminMediaGalleryClickImageInGridActionGroup
10+
AdminMediaGalleryClickAddSelectedActionGroup
11+
AdminEnhancedMediaGalleryViewImageDetails
12+
AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup
13+
CliMediaGalleryEnhancedEnableActionGroup
14+
BaseConfigurableProduct
15+
visualSwatchAttribute
16+
AddVisualSwatchToProductWithStorefrontConfigActionGroup
17+
AdminEnhancedMediaGalleryMassActionSection

0 commit comments

Comments
 (0)