Skip to content

Commit 061350c

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-24241' into 2.4-develop-pr19
2 parents 50efde8 + b7a49e2 commit 061350c

File tree

5 files changed

+91
-18
lines changed

5 files changed

+91
-18
lines changed

‎app/code/Magento/Email/Test/Mftf/ActionGroup/AdminUploadTransactionEmailsImageActionGroup.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminUploadTransactionEmailsImageActionGroup">
12+
<annotations>
13+
<description>Upload logo image for email</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="image" type="string" defaultValue="{{MagentoLogo.file}}"/>
17+
<argument name="width" type="string" defaultValue="200"/>
18+
<argument name="height" type="string" defaultValue="100"/>
19+
</arguments>
20+
21+
<conditionalClick selector="{{AdminDesignConfigSection.transactionalEmailSectionHeader}}" dependentSelector="{{AdminDesignConfigSection.transactionalEmailSectionBody}}" visible="false" stepKey="openTransactionalEmailSection"/>
22+
<waitForElementVisible selector="{{AdminDesignConfigSection.logoImageAlt}}" stepKey="waitVisibleUploadLogo"/>
23+
<attachFile selector="{{AdminDesignConfigSection.logoUpload}}" userInput="{{image}}" stepKey="attachLogo"/>
24+
<waitForElementVisible selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="waitingForLogoToUpload"/>
25+
<seeElement selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="logoPreviewIsVisible"/>
26+
<fillField selector="{{AdminDesignConfigSection.logoImageAlt}}" userInput="{{image}}" stepKey="fillFieldImageAlt"/>
27+
<fillField selector="{{AdminDesignConfigSection.logoImageWidth}}" userInput="{{width}}" stepKey="fillFieldImageWidth"/>
28+
<fillField selector="{{AdminDesignConfigSection.logoImageHeight}}" userInput="{{height}}" stepKey="fillFieldImageHeight"/>
29+
</actionGroup>
30+
</actionGroups>

‎app/code/Magento/Email/Test/Mftf/Test/TransactionalEmailsLogoUploadTest.xml‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,44 @@
1111
<test name="TransactionalEmailsLogoUploadTest">
1212
<annotations>
1313
<features value="Email"/>
14-
<stories value="Email"/>
15-
<title value="MC-13908: Uploading a Transactional Emails logo"/>
14+
<stories value="Transactional Emails logo"/>
15+
<title value="Uploading a Transactional Emails logo"/>
1616
<description value="Transactional Emails Logo should be able to be uploaded in the admin and previewed"/>
1717
<severity value="CRITICAL"/>
18-
<testCaseId value="MC-13908"/>
19-
<group value="LogoUpload"/>
20-
<skip>
21-
<issueId value="MC-18496"/>
22-
</skip>
18+
<testCaseId value="MC-27620"/>
19+
<useCaseId value="MC-10932"/>
20+
<group value="theme"/>
21+
<group value="email"/>
2322
</annotations>
24-
<!--Login to Admin Area-->
2523
<before>
26-
<actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
24+
<!--Login to Admin Area-->
25+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2726
</before>
28-
<!--Logout from Admin Area-->
2927
<after>
30-
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
28+
<!-- Clear filter on Design Config Page -->
29+
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
30+
<waitForPageLoad stepKey="waitForPageLoadToViewDesignConfigPage"/>
31+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
32+
<!--Logout from Admin Area-->
33+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
3134
</after>
3235
<!--Navigate to content->Design->Config page-->
3336
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
34-
<waitForPageLoad stepKey="waitForPageloadToViewDesignConfigPage"/>
35-
<click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
37+
<waitForPageLoad stepKey="waitForPageLoadToViewDesignConfigPage"/>
38+
<actionGroup ref="AdminGridFilterSearchResultsBySelectActionGroup" stepKey="filterThemeDesignConfiguration">
39+
<argument name="attributeSelector" value="store_id"/>
40+
<argument name="attributeValue" value="{{_defaultStore.name}}"/>
41+
</actionGroup>
42+
<click selector="{{AdminDesignConfigSection.scopeRow('1')}}" stepKey="editStoreView"/>
3643
<waitForPageLoad stepKey="waitForPageLoadToOpenStoreViewEditPage"/>
37-
<!--Click Upload logo in Transactional Emails and upload the image and preview it-->
38-
<click selector="{{AdminDesignConfigSection.logoWrapperOpen}}" stepKey="openTab" />
39-
<attachFile selector="{{AdminDesignConfigSection.logoUpload}}" userInput="{{MagentoLogo.file}}" stepKey="attachLogo"/>
40-
<wait time="5" stepKey="waitingForLogoToUpload" />
41-
<seeElement selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="LogoPreviewIsVisible"/>
44+
<!-- Upload Image -->
45+
<actionGroup ref="AdminUploadTransactionEmailsImageActionGroup" stepKey="uploadImage">
46+
<argument name="width" value="200"/>
47+
<argument name="height" value="100"/>
48+
</actionGroup>
49+
<!--Save Design Configuration -->
50+
<actionGroup ref="ClickSaveButtonActionGroup" stepKey="saveDesignConfiguration">
51+
<argument name="message" value="You saved the configuration."/>
52+
</actionGroup>
4253
</test>
4354
</tests>

‎app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<element name="logoUpload" type ="input" selector="[name='email_logo']" />
2727
<element name="logoWrapperOpen" type ="text" selector="[data-index='email'] [data-state-collapsible ='closed']"/>
2828
<element name="logoPreview" type ="text" selector="[alt ='magento-logo.png']"/>
29+
<element name="logoImageAlt" type ="text" selector="[name='email_logo_alt']"/>
30+
<element name="logoImageWidth" type ="text" selector="[name='email_logo_width']"/>
31+
<element name="logoImageHeight" type ="text" selector="[name='email_logo_height']"/>
2932
<element name="faviconArrow" type="button" selector="#ZmF2aWNvbg-- > .jstree-icon" />
3033
<element name="checkIfFaviconArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbg--' and contains(@class,'jstree-closed')]" />
3134
<element name="storesArrow" type="button" selector="#ZmF2aWNvbi9zdG9yZXM- > .jstree-icon" />
@@ -34,5 +37,7 @@
3437
<element name="imageWatermarkType" type="text" selector="//div[contains(@class, 'fieldset-wrapper-title')]//span[contains(text(), '{{watermarkType}}')]" parameterized="true"/>
3538
<element name="appliedTheme" type="select" selector="select[name='theme_theme_id']"/>
3639
<element name="scopeEditLinkByName" type="button" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[normalize-space(.)= '{{scope}}']/preceding-sibling::th)+1][contains(.,'{{scopeName}}')]/..//a[contains(@class, 'action-menu-item')]" timeout="30" parameterized="true"/>
40+
<element name="transactionalEmailSectionHeader" type="button" selector="[data-index='email'] .fieldset-wrapper-title" timeout="30"/>
41+
<element name="transactionalEmailSectionBody" type="block" selector="[data-index='email'] .admin__fieldset-wrapper-content" timeout="30"/>
3742
</section>
3843
</sections>

‎app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsBySelectActionGroup.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminGridFilterSearchResultsBySelectActionGroup">
12+
<annotations>
13+
<description>Filters an Admin Grid page using the provided Filter Selector and Search Value.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="attributeSelector" type="string" defaultValue="store_id"/>
17+
<argument name="attributeValue" type="string" defaultValue="{{_defaultStore.name}}"/>
18+
</arguments>
19+
20+
<conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector="{{AdminGridFilterControls.clearAll}}" visible="true" stepKey="clearTheFiltersIfPresent"/>
21+
<waitForPageLoad time="30" stepKey="waitForFilterApplied"/>
22+
<click selector="{{AdminGridFilterControls.filters}}" stepKey="clickOnFilters"/>
23+
<selectOption selector="{{AdminDataGridFilterSection.filterSelectFieldByName(attributeSelector)}}" userInput="{{attributeValue}}" stepKey="setAttributeValue"/>
24+
<click selector="{{AdminGridFilterControls.applyFilters}}" stepKey="clickOnApplyFilters"/>
25+
</actionGroup>
26+
</actionGroups>

‎app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<element name="filterExpand" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[@data-action='grid-filter-expand']" />
1414
<element name="inputFieldByNameAttr" type="input" selector="//*[@data-part='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true" />
1515
<element name="inputFieldByNameAttrInGrid" type="input" selector="//*[@data-role='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true"/>
16+
<element name="filterSelectFieldByName" type="select" selector="//*[@data-part='filter-form']//select[@name='{{fieldName}}']" parameterized="true"/>
1617
<element name="apply" type="button" selector="//*[@data-part='filter-form']//button[@data-action='grid-filter-apply']" />
1718
<element name="clear" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" />
1819
</section>

0 commit comments

Comments
 (0)