Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop

Author: tomreece

app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

@@ -17,7 +17,7 @@
     </actionGroup>
 
     <!--Create new user with specified role-->
-    <actionGroup name="AdminCreateUser">
+    <actionGroup name="AdminCreateUserAction">
         <click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
         <waitForPageLoad stepKey="waitForNewUserPageLoad" time="10"/>
         <fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{NewAdmin.username}}" stepKey="enterUserName" />
@@ -53,4 +53,4 @@
         <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
     </actionGroup>
 
-</actionGroups>
+</actionGroups>

app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CreateAnAdminOrderUsingBraintreePaymentTest1">
         <annotations>
             <features value="Backend"/>
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-93677"/>
             <group value="braintree"/>
+            <skip>
+                <issueId value="MQE-1187" />
+            </skip>
         </annotations>
 
 
@@ -42,7 +45,7 @@
 
         <!--Create New User With Specific Role-->
         <actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
-        <actionGroup ref="AdminCreateUser" stepKey="AdminCreateNewUser"/>
+        <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
 
         <!--SignOut-->
         <actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

@@ -91,6 +91,9 @@
             <description value="Should be able to place an order as a customer with multiple addresses and tax rates."/>
             <testCaseId value="MAGETWO-93109"/>
             <severity value="AVERAGE"/>
+            <skip>
+                <issueId value="MQE-1187" />
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleSubCategory" stepKey="simplecategory"/>

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

@@ -16,6 +16,9 @@
             <description value="Admin should be able to add image to WYSIWYG content of Block"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84376"/>
+            <skip>
+                <issueId value="MQE-1187" />
+            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />

composer.json

@@ -81,7 +81,7 @@
         "zendframework/zend-view": "~2.10.0"
     },
     "require-dev": {
-        "magento/magento2-functional-testing-framework": "2.3.3",
+        "magento/magento2-functional-testing-framework": "2.3.4",
         "friendsofphp/php-cs-fixer": "~2.12.0",
         "lusitanian/oauth": "~0.8.10",
         "pdepend/pdepend": "2.5.2",