Skip to content

Commit 98b8d2f

Browse files
author
Stanislav Idolov
committed
#787: Tests stabilization
1 parent 1755d80 commit 98b8d2f

File tree

8 files changed

+29
-28
lines changed

8 files changed

+29
-28
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="wysiwygLinkUrl" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//a[@href='{{link}}']" parameterized="true"/>
2424
<element name="imageOnStage" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//img[contains(@src,'{{image}}')]" parameterized="true"/>
2525
<element name="imageSourceByIndex" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]/div[contains(@data-background-images,'{{image}}')]" parameterized="true"/>
26-
<element name="bannerAltText" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@alt='{{arg2}}']" parameterized="true"/>
26+
<element name="bannerAltText" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@aria-label='{{arg2}}']" parameterized="true"/>
2727
<element name="bannerTitleAttribute" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2828
<element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
2929
<element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//*[contains(@class, 'magento-variable') and contains(@class, 'magento-placeholder')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<element name="overlay" type="button" selector="(//div[@data-content-type=&quot;banner&quot;])[{{bannerIndex}}]//div[@data-element=&quot;overlay&quot;]" parameterized="true"/>
2121
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-content-type=banner] div.pagebuilder-overlay')[{{overlayIndex}} - 1]" parameterized="true"/>
2222
<element name="wysiwygLinkUrl" type="button" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]//div[@data-element='wrapper']//a[@href='{{link}}']" parameterized="true"/>
23-
<element name="bannerAltText" type="button" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@alt='{{arg2}}']" parameterized="true"/>
23+
<element name="bannerAltText" type="button" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@aria-label='{{arg2}}']" parameterized="true"/>
2424
<element name="bannerTitleAttribute" type="button" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2525
<!-- Appearance Configuration -->
2626
<element name="appearance" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}][@data-appearance='{{appearance}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-content-type=slider] div.pagebuilder-overlay')[{{slideOverlayIndex}} - 1]" parameterized="true"/>
2020
<element name="editableButtonItemElement" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//a[@data-element='button']//span[contains(@contenteditable, 'true')]" parameterized="true"/>
2121
<element name="imageSourceByIndex" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@data-background-images,'{{image}}')]" parameterized="true" deprecated="Styles are not inline"/>
22-
<element name="slideAltText" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@alt='{{arg2}}']" parameterized="true"/>
22+
<element name="slideAltText" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@aria-label='{{arg2}}']" parameterized="true"/>
2323
<element name="slideTitleAttribute" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2424
<element name="openOptionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{navigationDotIndex}}]" parameterized="true"/>
2525
<element name="optionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{navigationDotIndex}}]//div[@class='pagebuilder-options-wrapper']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<element name="slickSlideIndex" type="text" selector="[data-slick-index='{{slickSlideIndex}}']" parameterized="true"/>
2121
<element name="computedBoxSizing" type="button" selector="return window.getComputedStyle(document.querySelector('[data-content-type=slide]')).boxSizing"/>
2222
<element name="wysiwygLinkUrl" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//a[@href='{{link}}']" parameterized="true"/>
23-
<element name="slideAltText" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@alt='{{arg2}}']" parameterized="true"/>
23+
<element name="slideAltText" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@aria-label='{{arg2}}']" parameterized="true"/>
2424
<element name="slideTitleAttribute" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2525
<!-- Appearance Configuration -->
2626
<element name="appearance" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-appearance='{{appearance}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@
3434
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
3535
</actionGroup>
3636
</before>
37-
<!-- <after>-->
38-
<!-- <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>-->
39-
<!-- <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>-->
40-
<!-- <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>-->
41-
<!-- <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>-->
42-
<!-- <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToDesktopImageFolder">-->
43-
<!-- <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>-->
44-
<!-- </actionGroup>-->
45-
<!-- <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteBackgroundImage">-->
46-
<!-- <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>-->
47-
<!-- </actionGroup>-->
48-
<!-- <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">-->
49-
<!-- <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>-->
50-
<!-- </actionGroup>-->
51-
<!-- <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>-->
52-
<!-- </after>-->
37+
<after>
38+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
39+
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
40+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
41+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
42+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToDesktopImageFolder">
43+
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
44+
</actionGroup>
45+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteBackgroundImage">
46+
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
47+
</actionGroup>
48+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
49+
<argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
52+
</after>
5353
<!-- Add Banner -->
5454
<comment userInput="Add Banner" stepKey="commentAddBanner"/>
5555
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">

‎app/code/Magento/PageBuilder/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@
406406
<item name="data-product-id" xsi:type="string"> data-product-id</item>
407407
<item name="data-price-box" xsi:type="string">data-price-box</item>
408408
<item name="aria-hidden" xsi:type="string">aria-hidden</item>
409+
<item name="aria-label" xsi:type="string">aria-label</item>
409410
<item name="data-tab-name" xsi:type="string">data-tab-name</item>
410411
<item name="data-video-fallback-src" xsi:type="string">data-video-fallback-src</item>
411412
<item name="data-video-lazy-load" xsi:type="string">data-video-lazy-load</item>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
6666
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
6767
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
68-
<attribute name="alt" source="alt"/>
68+
<attribute name="alt" source="aria-label"/>
6969
<attribute name="title_attribute" source="title"/>
7070
</element>
7171
<element name="overlay">
@@ -153,7 +153,7 @@
153153
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
154154
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
155155
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
156-
<attribute name="alt" source="alt"/>
156+
<attribute name="alt" source="aria-label"/>
157157
<attribute name="title_attribute" source="title"/>
158158
</element>
159159
<element name="overlay">
@@ -241,7 +241,7 @@
241241
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
242242
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
243243
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
244-
<attribute name="alt" source="alt"/>
244+
<attribute name="alt" source="aria-label"/>
245245
<attribute name="title_attribute" source="title"/>
246246
</element>
247247
<element name="overlay">
@@ -328,7 +328,7 @@
328328
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
329329
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
330330
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
331-
<attribute name="alt" source="alt"/>
331+
<attribute name="alt" source="aria-label"/>
332332
<attribute name="title_attribute" source="title"/>
333333
</element>
334334
<element name="overlay">

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
7272
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
7373
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
74-
<attribute name="alt" source="alt"/>
74+
<attribute name="alt" source="aria-label"/>
7575
<attribute name="title_attribute" source="title"/>
7676
</element>
7777
<element name="content">
@@ -158,7 +158,7 @@
158158
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
159159
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
160160
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
161-
<attribute name="alt" source="alt"/>
161+
<attribute name="alt" source="aria-label"/>
162162
<attribute name="title_attribute" source="title"/>
163163
</element>
164164
<element name="content">
@@ -245,7 +245,7 @@
245245
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
246246
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
247247
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
248-
<attribute name="alt" source="alt"/>
248+
<attribute name="alt" source="aria-label"/>
249249
<attribute name="title_attribute" source="title"/>
250250
</element>
251251
<element name="content">
@@ -334,7 +334,7 @@
334334
<attribute name="video_play_only_visible" source="data-video-play-only-visible"/>
335335
<attribute name="video_lazy_load" source="data-video-lazy-load"/>
336336
<attribute name="video_fallback_image" source="data-video-fallback-src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
337-
<attribute name="alt" source="alt"/>
337+
<attribute name="alt" source="aria-label"/>
338338
<attribute name="title_attribute" source="title"/>
339339
</element>
340340
<element name="content">

0 commit comments

Comments
 (0)