Skip to content

Commit 9315a6a

Browse files
xmavxmav
committed
Merge remote-tracking branch 'commerce/develop' into platform-health
2 parents c03fb06 + ca3e30b commit 9315a6a

File tree

17 files changed

+182
-2
lines changed

17 files changed

+182
-2
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,18 @@
235235
<data key="value">rgba(174, 198, 207, 0.7)</data>
236236
<data key="rgb">rgba(174, 198, 207, 0.7)</data>
237237
</entity>
238+
<!-- Banner Alt Text -->
239+
<entity name="PageBuilderBannerAltTextProperty" type="pagebuilder_alt_text_property">
240+
<data key="name">Alternative Text</data>
241+
<data key="section">seo</data>
242+
<data key="fieldName">alt</data>
243+
<data key="value">This is alternative text.</data>
244+
</entity>
245+
<!-- Banner Title Attribute -->
246+
<entity name="PageBuilderBannerTitleAttributeProperty" type="pagebuilder_title_attribute_property">
247+
<data key="name">Title Attribute</data>
248+
<data key="section">seo</data>
249+
<data key="fieldName">title_attribute</data>
250+
<data key="value">This is a Title Attribute</data>
251+
</entity>
238252
</entities>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,4 +254,18 @@
254254
<data key="errorMessage">Adding widget in content and link in outer element is not allowed.</data>
255255
<data key="stageErrorMessage">We are unable to support widget within the content field whilst having a link set on the content type. Please remove the content type link if you'd like to set a widget within the content. We will automatically remove the widget within the content field.</data>
256256
</entity>
257+
<!-- Slide Alt Text -->
258+
<entity name="PageBuilderSlideAltTextProperty" type="pagebuilder_alt_text_property">
259+
<data key="name">Alternative Text</data>
260+
<data key="section">seo</data>
261+
<data key="fieldName">alt</data>
262+
<data key="value">This is alternative text.</data>
263+
</entity>
264+
<!-- Slide Title Attribute -->
265+
<entity name="PageBuilderSlideTitleAttributeProperty" type="pagebuilder_title_attribute_property">
266+
<data key="name">Title Attribute</data>
267+
<data key="section">seo</data>
268+
<data key="fieldName">title_attribute</data>
269+
<data key="value">This is a Title Attribute</data>
270+
</entity>
257271
</entities>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
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[@aria-label='{{arg2}}']" parameterized="true"/>
27+
<element name="bannerTitleAttribute" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2628
<element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
2729
<element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//*[contains(@class, 'magento-variable') and contains(@class, 'magento-placeholder')]" parameterized="true"/>
2830
<element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//*[contains(@class, 'magento-placeholder') and contains(@class, 'magento-widget')]" parameterized="true"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
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[@aria-label='{{arg2}}']" parameterized="true"/>
24+
<element name="bannerTitleAttribute" type="button" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2325
<!-- Appearance Configuration -->
2426
<element name="appearance" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}][@data-appearance='{{appearance}}']" parameterized="true"/>
2527
<element name="appearancePosterCSS" type="button" selector="[data-content-type=banner][data-appearance=poster]"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
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[@aria-label='{{arg2}}']" parameterized="true"/>
23+
<element name="slideTitleAttribute" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2224
<element name="openOptionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{navigationDotIndex}}]" parameterized="true"/>
2325
<element name="optionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{navigationDotIndex}}]//div[@class='pagebuilder-options-wrapper']" parameterized="true"/>
2426
<element name="optionsMenuButton" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{navigationDotIndex}}]//li[contains(@class,'pagebuilder-options-link')]//a[contains(@class,'{{buttonClass}}')]" parameterized="true"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
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[@aria-label='{{arg2}}']" parameterized="true"/>
24+
<element name="slideTitleAttribute" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
2325
<!-- Appearance Configuration -->
2426
<element name="appearance" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-appearance='{{appearance}}']" parameterized="true"/>
2527
<element name="slideName" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-slide-name='{{slideName}}']" parameterized="true"/>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@
4545
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4646
<argument name="contentType" value="PageBuilderBannerContentType"/>
4747
</actionGroup>
48+
<!-- Clear Fields -->
49+
<comment userInput="Clear Fields" stepKey="commentClearFields"/>
50+
<actionGroup ref="clearSlideOutPanelFieldGeneral" stepKey="clearAltText">
51+
<argument name="property" value="PageBuilderBannerAltTextProperty"/>
52+
</actionGroup>
53+
<actionGroup ref="clearSlideOutPanelFieldGeneral" stepKey="clearTitleAttr">
54+
<argument name="property" value="PageBuilderBannerTitleAttributeProperty"/>
55+
</actionGroup>
4856
<dontSeeElement selector="{{EditPanelForm.editFormAllRequiredFields}}" stepKey="checkNoRequiredField"/>
4957
</test>
5058
</tests>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,21 @@
114114
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setOverlayColor">
115115
<argument name="property" value="PageBuilderBannerOverlayColor_Blue_Opaque"/>
116116
</actionGroup>
117+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterAltText">
118+
<argument name="property" value="PageBuilderBannerAltTextProperty"/>
119+
</actionGroup>
120+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterTitleAttribute">
121+
<argument name="property" value="PageBuilderBannerTitleAttributeProperty"/>
122+
</actionGroup>
117123
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
118124
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
119125
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
120126
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
121127
<!-- Validate CMS Block Stage -->
122128
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
123129
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceCMSBlockStage"/>
130+
<seeElement selector="{{BannerOnBackend.bannerAltText('1', PageBuilderBannerAltTextProperty.value)}}" stepKey="seeBannerAltTextCMSBlockStage"/>
131+
<seeElement selector="{{BannerOnBackend.bannerTitleAttribute('1', PageBuilderBannerTitleAttributeProperty.value)}}" stepKey="seeBannerTitleAttributeCMSBlockStage"/>
124132
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSBlockStage">
125133
<argument name="page" value="BannerOnBackend"/>
126134
<argument name="padding" value="PageBuilderPaddingProperty0"/>
@@ -202,6 +210,8 @@
202210
<!-- Validate CMS Page Stage -->
203211
<comment userInput="Validate CMS Page Stage" stepKey="commentValidateCMSPageStage"/>
204212
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceCMSPageStage"/>
213+
<seeElement selector="{{BannerOnFrontend.bannerAltText('1', PageBuilderBannerAltTextProperty.value)}}" stepKey="seeBannerAltTextCMSPageStage"/>
214+
<seeElement selector="{{BannerOnFrontend.bannerTitleAttribute('1', PageBuilderBannerTitleAttributeProperty.value)}}" stepKey="seeBannerTitleAttributeCMSPageStage"/>
205215
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStage">
206216
<argument name="page" value="BannerOnFrontend"/>
207217
<argument name="padding" value="PageBuilderPaddingProperty0"/>
@@ -255,6 +265,8 @@
255265
<argument name="page" value="$$createCMSPage.identifier$$"/>
256266
</actionGroup>
257267
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceCMSPageStorefront"/>
268+
<seeElement selector="{{BannerOnFrontend.bannerAltText('1', PageBuilderBannerAltTextProperty.value)}}" stepKey="seeBannerAltTextCMSPageStorefront"/>
269+
<seeElement selector="{{BannerOnFrontend.bannerTitleAttribute('1', PageBuilderBannerTitleAttributeProperty.value)}}" stepKey="seeBannerTitleAttributeCMSPageStorefront"/>
258270
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStorefront">
259271
<argument name="page" value="BannerOnFrontend"/>
260272
<argument name="padding" value="PageBuilderPaddingProperty0"/>
@@ -321,6 +333,8 @@
321333
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStoreFrontMobile">
322334
<argument name="page" value="$$createCMSPage.identifier$$"/>
323335
</actionGroup>
336+
<seeElement selector="{{BannerOnFrontend.bannerAltText('1', PageBuilderBannerAltTextProperty.value)}}" stepKey="seeBannerAltTextCMSPageStorefrontMobile"/>
337+
<seeElement selector="{{BannerOnFrontend.bannerTitleAttribute('1', PageBuilderBannerTitleAttributeProperty.value)}}" stepKey="seeBannerTitleAttributeCMSPageStorefrontMobile"/>
324338
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
325339
<argument name="page" value="BannerOnFrontend"/>
326340
<argument name="padding" value="PageBuilderPaddingProperty0"/>

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@
7070
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setSlideName">
7171
<argument name="property" value="PageBuilderSlideItemSlideName_Slide1"/>
7272
</actionGroup>
73+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterAltText">
74+
<argument name="property" value="PageBuilderSlideAltTextProperty"/>
75+
</actionGroup>
76+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterTitleAttribute">
77+
<argument name="property" value="PageBuilderSlideTitleAttributeProperty"/>
78+
</actionGroup>
7379
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setMinHeight">
7480
<argument name="property" value="PageBuilderMinHeightProperty_500px"/>
7581
</actionGroup>
@@ -123,6 +129,8 @@
123129
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
124130
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusSlideOptions"/>
125131
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceCMSBlockStage"/>
132+
<seeElement selector="{{SlideOnBackend.slideAltText('1', PageBuilderSlideAltTextProperty.value)}}" stepKey="seeSlideAltTextCMSBlockStage"/>
133+
<seeElement selector="{{SlideOnBackend.slideTitleAttribute('1', PageBuilderSlideTitleAttributeProperty.value)}}" stepKey="seeSlideTitleAttributeCMSBlockStage"/>
126134
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSBlockStage">
127135
<argument name="page" value="SlideOnBackend"/>
128136
</actionGroup>
@@ -205,6 +213,8 @@
205213
<!-- Validate CMS Page Stage -->
206214
<comment userInput="Validate CMS Page Stage" stepKey="commentValidateCMSPageStage"/>
207215
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceCMSPageStage"/>
216+
<seeElement selector="{{SlideOnFrontend.slideAltText('1', PageBuilderSlideAltTextProperty.value)}}" stepKey="seeSlideAltTextCMSPageStage"/>
217+
<seeElement selector="{{SlideOnFrontend.slideTitleAttribute('1', PageBuilderSlideTitleAttributeProperty.value)}}" stepKey="seeSlideTitleAttributeCMSPageStage"/>
208218
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStage">
209219
<argument name="page" value="SlideOnFrontend"/>
210220
</actionGroup>
@@ -256,6 +266,8 @@
256266
<argument name="page" value="$$createCMSPage.identifier$$"/>
257267
</actionGroup>
258268
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceCMSPageStorefront"/>
269+
<seeElement selector="{{SlideOnFrontend.slideAltText('1', PageBuilderSlideAltTextProperty.value)}}" stepKey="seeSlideAltTextCMSPageStorefront"/>
270+
<seeElement selector="{{SlideOnFrontend.slideTitleAttribute('1', PageBuilderSlideTitleAttributeProperty.value)}}" stepKey="seeSlideTitleAttributeCMSPageStorefront"/>
259271
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStorefront">
260272
<argument name="page" value="SlideOnFrontend"/>
261273
</actionGroup>
@@ -332,6 +344,8 @@
332344
<argument name="section" value="SlideOnFrontend"/>
333345
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
334346
</actionGroup>
347+
<seeElement selector="{{SlideOnFrontend.slideAltText('1', PageBuilderSlideAltTextProperty.value)}}" stepKey="seeSlideAltTextCMSPageStorefrontMobile"/>
348+
<seeElement selector="{{SlideOnFrontend.slideTitleAttribute('1', PageBuilderSlideTitleAttributeProperty.value)}}" stepKey="seeSlideTitleAttributeCMSPageStorefrontMobile"/>
335349
<seeElementInDOM selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonInDOMCMSPageStorefrontMobile"/>
336350
<dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonCMSPageStorefrontMobile"/>
337351
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayCMSPageStorefrontMobile">
@@ -353,4 +367,4 @@
353367
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurCMSPageStorefrontMobile"/>
354368
<seeCurrentUrlEquals url="{{PageBuilderSlideItemLinkURL_External.value}}" stepKey="seeThatUrlIsChangedToButtonUrlCMSPageStorefrontMobile"/>
355369
</test>
356-
</tests>
370+
</tests>

0 commit comments

Comments
 (0)