Skip to content

Commit 90db981

Browse files
engcom-Hotelengcom-Hotel
authored
Merge branch 'develop' into fixed-returning-from-method-that-doesnt-return
2 parents c6d6bef + 1522eb2 commit 90db981

File tree

104 files changed

+205
-307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+205
-307
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackground.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageCenter"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundFallbackImage.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageCenter"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundNoFallbackImage.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageCenter"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageCenter"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="setAppearance">
2726
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackground.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageLeft"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundFallbackImage.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageLeft"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundNoFallbackImage.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageLeft"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageLeft"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="setAppearance">
2726
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageRight"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageRight"/>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageRight"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageRight"/>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageRight"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
2726
<argument name="property" value="PageBuilderAppearance_CollageRight"/>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,7 +21,6 @@
2121
<group value="pagebuilder-bannerCollageRight"/>
2222
<group value="pagebuilder-backgroundForm"/>
2323
<group value="pagebuilder-video-background"/>
24-
<group value="pr_exclude"/>
2524
</annotations>
2625
<actionGroup ref="chooseVisualSelectOption" stepKey="setAppearance">
2726
<argument name="property" value="PageBuilderAppearance_CollageRight"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTinyMCEMenuOpensInFrontOfVideoBackground.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<before>
2625
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundAspectRatio.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<before>
2625
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopDisabled.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setInfiniteLoopEnabled">
2625
<argument name="property" value="PageBuilderVideoBackgroundInfiniteLoop_Disabled"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopEnabled.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<before>
2625
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadDisabled.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setLazyLoadDisabled">
2625
<argument name="property" value="PageBuilderVideoBackgroundLazyLoad_Disabled"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadEnabled.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setLazyLoadDisabled">
2625
<argument name="property" value="PageBuilderVideoBackgroundLazyLoad_Enabled"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<before>
2625
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<before>
2625
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundSectionDefaultValues.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -20,7 +20,6 @@
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-backgroundForm"/>
2222
<group value="pagebuilder-video-background"/>
23-
<group value="pr_exclude"/>
2423
</annotations>
2524
<before>
2625
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

0 commit comments

Comments
 (0)