MC-24241: [MFTF Test] Uploading a Transactional Emails logo

Author: Stas Puga

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

@@ -14,15 +14,15 @@
         </annotations>
         <arguments>
             <argument name="image" type="string" defaultValue="{{MagentoLogo.file}}"/>
-            <argument name="width" type="string"/>
-            <argument name="height" type="string"/>
+            <argument name="width" type="string" defaultValue="200"/>
+            <argument name="height" type="string" defaultValue="100"/>
         </arguments>
 
-        <conditionalClick selector="{{AdminDesignConfigSection.logoSectionHeader}}" dependentSelector="{{AdminDesignConfigSection.logoWrapperOpen}}" visible="true" stepKey="openTab"/>
+        <conditionalClick selector="{{AdminDesignConfigSection.transactionalEmailSectionHeader}}" dependentSelector="{{AdminDesignConfigSection.transactionalEmailSectionBody}}" visible="false" stepKey="openTransactionalEmailSection"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.logoImageAlt}}" stepKey="waitVisibleUploadLogo"/>
         <attachFile selector="{{AdminDesignConfigSection.logoUpload}}" userInput="{{image}}" stepKey="attachLogo"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="waitingForLogoToUpload"/>
-        <seeElement selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="LogoPreviewIsVisible"/>
+        <seeElement selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="logoPreviewIsVisible"/>
         <fillField selector="{{AdminDesignConfigSection.logoImageAlt}}" userInput="{{image}}" stepKey="fillFieldImageAlt"/>
         <fillField selector="{{AdminDesignConfigSection.logoImageWidth}}" userInput="{{width}}" stepKey="fillFieldImageWidth"/>
         <fillField selector="{{AdminDesignConfigSection.logoImageHeight}}" userInput="{{height}}" stepKey="fillFieldImageHeight"/>

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

@@ -16,8 +16,9 @@
             <description value="Transactional Emails Logo should be able to be uploaded in the admin and previewed"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-27620"/>
-            <useCaseId value="MC-24241"/>
-            <group value="logoUpload"/>
+            <useCaseId value="MC-10932"/>
+            <group value="theme"/>
+            <group value="email"/>
         </annotations>
         <before>
             <!--Login to Admin Area-->
@@ -35,8 +36,8 @@
         <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
         <waitForPageLoad stepKey="waitForPageLoadToViewDesignConfigPage"/>
         <actionGroup ref="AdminGridFilterSearchResultsBySelectActionGroup" stepKey="filterThemeDesignConfiguration">
-            <argument name="selectorAttr" value="store_id"/>
-            <argument name="store" value="{{_defaultStore.name}}"/>
+            <argument name="attributeSelector" value="store_id"/>
+            <argument name="attributeValue" value="{{_defaultStore.name}}"/>
         </actionGroup>
         <click selector="{{AdminDesignConfigSection.scopeRow('1')}}" stepKey="editStoreView"/>
         <waitForPageLoad stepKey="waitForPageLoadToOpenStoreViewEditPage"/>

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

@@ -37,5 +37,7 @@
         <element name="imageWatermarkType" type="text" selector="//div[contains(@class, 'fieldset-wrapper-title')]//span[contains(text(), '{{watermarkType}}')]" parameterized="true"/>
         <element name="appliedTheme" type="select" selector="select[name='theme_theme_id']"/>
         <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"/>
+        <element name="transactionalEmailSectionHeader" type="button" selector="[data-index='email'] .fieldset-wrapper-title" timeout="30"/>
+        <element name="transactionalEmailSectionBody" type="block" selector="[data-index='email'] .admin__fieldset-wrapper-content" timeout="30"/>
     </section>
 </sections>

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

@@ -13,14 +13,14 @@
             <description>Filters an Admin Grid page using the provided Filter Selector and Search Value.</description>
         </annotations>
         <arguments>
-            <argument name="selectorAttr" type="string"/>
-            <argument name="store" type="string"/>
+            <argument name="attributeSelector" type="string"/>
+            <argument name="attributeValue" type="string"/>
         </arguments>
 
         <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector="{{AdminGridFilterControls.clearAll}}" visible="true" stepKey="clearTheFiltersIfPresent"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
+        <waitForPageLoad time="30" stepKey="waitForFilterApplied"/>
         <click selector="{{AdminGridFilterControls.filters}}" stepKey="clickOnFilters"/>
-        <selectOption selector="{{AdminDataGridFilterSection.selectFieldByNameAttrInGrid(selectorAttr)}}" userInput="{{store}}" stepKey="selectStoreView"/>
+        <selectOption selector="{{AdminDataGridFilterSection.filterSelectFieldByName(attributeSelector)}}" userInput="{{attributeValue}}" stepKey="selectFieldByName"/>
         <click selector="{{AdminGridFilterControls.applyFilters}}" stepKey="clickOnApplyFilters"/>
     </actionGroup>
 </actionGroups>

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

@@ -13,7 +13,7 @@
         <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']" />
         <element name="inputFieldByNameAttr" type="input" selector="//*[@data-part='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true" />
         <element name="inputFieldByNameAttrInGrid" type="input" selector="//*[@data-role='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true"/>
-        <element name="selectFieldByNameAttrInGrid" type="select" selector="//*[@data-part='filter-form']//select[@name='{{selectNameAttr}}']" parameterized="true"/>
+        <element name="filterSelectFieldByName" type="select" selector="//*[@data-part='filter-form']//select[@name='{{fieldName}}']" parameterized="true"/>
         <element name="apply" type="button" selector="//*[@data-part='filter-form']//button[@data-action='grid-filter-apply']" />
         <element name="clear" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" />
     </section>