Merge remote-tracking branch 'origin/MC-5574' into BugFixPR

Author: Joan He

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml

@@ -16,9 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84375"/>
-            <skip>
-                <issueId value="MAGETWO-94438"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml

@@ -90,7 +90,7 @@
         <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
         <see userInput="${{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
         <see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
-        <waitForText userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="30" stepKey="assertShipping"/>
+        <waitForText userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
         <see userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
     </actionGroup>
 

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml

@@ -17,9 +17,6 @@
             <description value="Verify that admin is able to upload image to CMS Page with TinyMCE3 enabled"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95725"/>
-            <skip>
-                <issueId value="MC-5371" />
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml

@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-207"/>
             <group value="Downloadable"/>
-            <skip>
-                <issueId value="MAGETWO-94795"/>
-            </skip>
         </annotations>
 
         <!-- Create a downloadable product -->

app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml

@@ -17,9 +17,6 @@
             <description value="Admin should able to switch between versions of TinyMCE"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-82936"/>
-            <skip>
-                <issueId value="MAGETWO-89417"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>