MAGETWO-86243: Admin orders can result in a customer with an example email address

Author: zakdma

app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateBundleProductTest.xml

@@ -21,10 +21,10 @@
         <before>
             <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
             <createData entity="SimpleProduct" stepKey="createPreReqSimpleProduct1">
-            <requiredEntity createDataKey="createPreReqCategory"/>
+                <requiredEntity createDataKey="createPreReqCategory"/>
             </createData>
             <createData entity="SimpleProduct2" stepKey="createPreReqSimpleProduct2">
-            <requiredEntity createDataKey="createPreReqCategory"/>
+                <requiredEntity createDataKey="createPreReqCategory"/>
             </createData>
         </before>
         <after>
@@ -45,8 +45,8 @@
         <!--Step4. Fill in all data according to data set-->
         <actionGroup ref="CreateBundleProductForTwoSimpleProducts" stepKey="CreateBundleProductForTwoSimpleProducts">
             <argument name="bundleProduct" value="BundleProduct"/>
-            <argument name="simpleProductFirst" value="SimpleProduct"/>
-            <argument name="simpleProductSecond" value="SimpleProduct2"/>
+            <argument name="simpleProductFirst" value="$$createPreReqSimpleProduct1$$"/>
+            <argument name="simpleProductSecond" value="$$createPreReqSimpleProduct2$$"/>
         </actionGroup>
 
         <!--Step5. Save product-->

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml

@@ -21,7 +21,7 @@
         <click selector="{{AdminProductAttributeGridSection.search}}" stepKey="searchForAttribute"/>
         <click selector="{{AdminProductAttributeGridSection.firstRow}}" stepKey="clickFirstRow"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
-        <click selector="{{AdminProductAttributeEditMenuSection.deleteAttribute}}" stepKey="deleteProductAttribute"/>
+        <click selector="{{AdminProductAttributeEditSection.deleteAttribute}}" stepKey="deleteProductAttribute"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitingForWarningModal"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
     </actionGroup>

app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryProductAttributeEditPage.xml

@@ -8,8 +8,8 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminCategoryProductAttributeEditPage" url="catalog/product_attribute/edit/" area="admin" module="Catalog">
-        <section name="AdminProductAttributeEditMenu"/>
+    <page name="AdminCategoryProductAttributeEditPage" url="catalog/product_attribute/edit/" area="admin" module="Magento_Catalog">
+        <section name="AdminProductAttributeEditSection"/>
         <section name="AdminConfirmationModalSection"/>
     </page>
 </pages>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeEditMenuSection.xml renamed to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeEditSection.xml

@@ -8,7 +8,7 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminProductAttributeEditMenuSection">
+    <section name="AdminProductAttributeEditSection">
         <element name="deleteAttribute" type="button" selector="#delete" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml

@@ -21,7 +21,7 @@
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
         <element name="productGridXRowYColumnButton" type="input" selector="table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
         <element name="productNameInNameColumn" type="input" selector="//td[4]/div[@class='data-grid-cell-content']"/>
-        <element name="checkbox" type="checkbox" selector="//div[contains(text(),'{{product}}')]/ancestor::tr[@class='data-row']//input[@class='admin__control-checkbox']" parameterized="true" />
+        <element name="checkbox" type="checkbox" selector="//div[contains(text(),'{{product}}')]/ancestor::tr[contains(@class, 'data-row')]//input[@class='admin__control-checkbox']" parameterized="true" />
         <element name="firstRowCheckbox" type="checkbox" selector="tr.data-row:nth-of-type(1) input.admin__control-checkbox"/>
         <element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
         <element name="productGridNameProduct" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>