Merge remote-tracking branch 'honey/honey-bugs-pr' into pr

Author: Joan He

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="TransactionalEmailsLogoUploadTest">
+        <annotations>
+            <features value="Email"/>
+            <stories value="Email"/>
+            <title value="MC-13908: Uploading a Transactional Emails logo"/>
+            <description value="Transactional Emails Logo should be able to be uploaded in the admin and previewed"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13908"/>
+            <group value="LogoUpload"/>
+        </annotations>
+        <!--Login to Admin Area-->
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        </before>
+        <!--Logout from Admin Area-->
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <!--Navigate to content->Design->Config page-->
+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
+        <waitForPageLoad stepKey="waitForPageloadToViewDesignConfigPage"/>
+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoadToOpenStoreViewEditPage"/>
+        <!--Click Upload logo in Transactional Emails and upload the image and preview it-->
+        <click selector="{{AdminDesignConfigSection.logoWrapperOpen}}" stepKey="openTab" />
+        <attachFile selector="{{AdminDesignConfigSection.logoUpload}}" userInput="{{MagentoLogo.file}}" stepKey="attachLogo"/>
+        <wait time="5" stepKey="waitingForLogoToUpload" />
+        <seeElement selector="{{AdminDesignConfigSection.logoPreview}}" stepKey="LogoPreviewIsVisible"/>
+    </test>
+</tests>

app/code/Magento/Email/view/adminhtml/ui_component/design_config_form.xml

@@ -13,7 +13,7 @@
                 <collapsible>true</collapsible>
                 <label translate="true">Transactional Emails</label>
             </settings>
-            <field name="email_logo" formElement="fileUploader">
+            <field name="email_logo" formElement="imageUploader">
                 <settings>
                     <notice translate="true">To optimize logo for high-resolution displays, upload an image that is 3x normal size and then specify 1x dimensions in the width/height fields below.</notice>
                     <label translate="true">Logo Image</label>

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

@@ -14,5 +14,10 @@
         <element name="watermarkSection" type="text" selector="[data-index='watermark'] .admin__fieldset-wrapper-content"/>
         <element name="imageUploadInputByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//input" parameterized="true"/>
         <element name="imageUploadPreviewByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader-preview')]//img" parameterized="true"/>
+        <element name="logoSectionHeader" type="text" selector="[data-index='email']"/>
+        <element name="logoSection" type="text" selector="[data-index='email'] .admin__fieldset-wrapper-content"/>
+        <element name="logoUpload" type ="input" selector="[name='email_logo']" />
+        <element name="logoWrapperOpen" type ="text" selector="[data-index='email'] [data-state-collapsible ='closed']"/>
+        <element name="logoPreview" type ="text" selector="[alt ='magento-logo.png']"/>
     </section>
 </sections>

dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php

@@ -109,29 +109,13 @@ protected function setUp()
             });
     }
 
-    /**
-     * Checks that pid files are created
-     *
-     * @return void
-     */
-    public function testCheckThatPidFilesWasCreated()
-    {
-        $this->markTestSkipped('MC-5904: Test Fails randomly,');
-        $this->consumersRunner->run();
-        foreach ($this->consumerConfig->getConsumers() as $consumer) {
-            $this->waitConsumerPidFile($consumer->getName());
-        }
-    }
-
     /**
      * Tests running of specific consumer and his re-running when it is working
      *
      * @return void
      */
     public function testSpecificConsumerAndRerun()
     {
-        $this->markTestSkipped('MC-5904: Test Fails randomly,');
-
         $specificConsumer = 'quoteItemCleaner';
         $pidFilePath = $this->getPidFileName($specificConsumer);
         $config = $this->config;
@@ -188,23 +172,6 @@ public function testCronJobDisabled()
         }
     }
 
-    /**
-     * @param string $consumerName
-     * @return void
-     */
-    private function waitConsumerPidFile($consumerName)
-    {
-        $pidFileFullPath = $this->getPidFileFullPath($consumerName);
-        $i = 0;
-        do {
-            sleep(1);
-        } while (!file_exists($pidFileFullPath) && ($i++ < 60));
-
-        if (!file_exists($pidFileFullPath)) {
-            $this->fail($consumerName . ' pid file does not exist.');
-        }
-    }
-
     /**
      * @return array
      */