Merge branch '2.3-tests-pr' of github.com:magento-pangolin/magento2ce into MC-11438

Author: mkovdrysh

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

@@ -271,19 +271,6 @@
         <requiredEntity type="address">US_Address_TX</requiredEntity>
         <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
     </entity>
-    <entity name="Simple_US_Customer_Incorrect_Email" type="customer">
-        <data key="group_id">0</data>
-        <data key="default_billing">true</data>
-        <data key="default_shipping">true</data>
-        <data key="email">&gt;&lt;script&gt;alert(1);&lt;/script&gt;@example.com</data>
-        <data key="firstname">John</data>
-        <data key="lastname">Doe</data>
-        <data key="fullname">John Doe</data>
-        <data key="password">pwdTest123!</data>
-        <data key="store_id">0</data>
-        <data key="website_id">0</data>
-        <requiredEntity type="address">US_Address_CA</requiredEntity>
-    </entity>
     <entity name="John_Smith_Customer" type="customer">
         <data key="group_id">1</data>
         <data key="email" unique="prefix">[email protected]</data>
@@ -294,14 +281,17 @@
         <data key="store_id">0</data>
         <data key="website_id">0</data>
     </entity>
-    <entity name="John_Smith_Customer" type="customer">
-        <data key="group_id">1</data>
-        <data key="email" unique="prefix">[email protected]</data>
+    <entity name="Simple_US_Customer_Incorrect_Email" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email">&gt;&lt;script&gt;alert(1);&lt;/script&gt;@example.com</data>
         <data key="firstname">John</data>
-        <data key="lastname">Smith</data>
-        <data key="fullname">John Smith</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
         <data key="password">pwdTest123!</data>
         <data key="store_id">0</data>
         <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_CA</requiredEntity>
     </entity>
 </entities>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml

@@ -14,8 +14,7 @@
         <element name="requiredGroup" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-group-id']"/>
         <element name="requiredEmail" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-email']"/>
         <element name="defaultGeneral" type="text" selector="//*[contains(text(),'General')]" timeout="15"/>
-        <element name="defaultGeneral" type="text" selector="//*[contains(text(),'General')]" time="15"/>
         <element name="emailErrorMessage" type="text" selector="#email-error"/>
         <element name="defaultGeneral" type="text" selector="//*[contains(text(),'General')]" timeout="15"/>
     </section>
-</sections>
+</sections>