Merge remote-tracking branch 'upstream/2.3-develop' into BugFixPR

Joan He · Joan He · commit e342395ca002 · 2018-11-30T15:36:46.000-06:00
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups 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/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 
     <actionGroup name="ConfigureBraintree">
         <!-- GoTo ConfigureBraintree fields -->
@@ -46,4 +46,8 @@
         <waitForElementVisible selector="{{BraintreeConfiguraionSection.successfulMessage}}" stepKey="waitForSuccessfullyConfigured" time="10"/>
     </actionGroup>
 
+    <actionGroup name="DisableBrainTree">
+        <magentoCLI stepKey="disableBrainTree" command="config:set payment/braintree/active 0"/>
+        <magentoCLI stepKey="disableBrainTreePaypal" command="config:set payment/braintree_paypal/active 0"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -8,28 +8,7 @@
 <actionGroups 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/actionGroupSchema.xsd">
 
-    <actionGroup name="CreateNewOrderActionGroup">
-        <click stepKey="createNewOrder" selector="{{NewOrderSection.createNewOrder}}"/>
-        <waitForPageLoad stepKey="waitForCustomersList" time="3"/>
-        <click stepKey="chooseCustomer" selector="{{NewOrderSection.customer}}"/>
-        <waitForPageLoad stepKey="waitForOrderPage" time="3"/>
-        <click stepKey="addProducts" selector="{{NewOrderSection.addProducts}}"/>
-        <waitForPageLoad stepKey="waitForProducts" time="3"/>
-        <click stepKey="chooseProducts" selector="{{NewOrderSection.chooseProduct}}"/>
-        <waitForPageLoad stepKey="waitForProductChoose" time="3"/>
-        <click stepKey="addSelectedProduct" selector="{{NewOrderSection.addSelectedProduct}}"/>
-        <waitForAjaxLoad stepKey="waitForChoose" time="3"/>
-        <click stepKey="openAddresses" selector="{{NewOrderSection.openAddresses}}"/>
-        <click stepKey="chooseAddress" selector="{{NewOrderSection.chooseAddress}}"/>
-        <fillField stepKey="fillState" selector="{{NewOrderSection.state}}" userInput="Yerevan"/>
-        <scrollTo stepKey="scrollTo" selector="#order-methods"/>
-        <waitForPageLoad stepKey="waitForMethods" time="3"/>
-        <click stepKey="startJSMethodExecution" selector="{{NewOrderSection.openShippingMethods}}"/>
-        <waitForPageLoad stepKey="waitForJSMethodExecution" time="3"/>
-        <click stepKey="openShippingMethods" selector="{{NewOrderSection.openShippingMethods}}"/>
-        <waitForPageLoad stepKey="waitForShippingMethods" time="3"/>
-        <click stepKey="chooseShippingMethods" selector="{{NewOrderSection.shippingMethod}}"/>
-        <waitForPageLoad stepKey="waitForShippingMethodChoose" time="4"/>
+    <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
         <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
         <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
@@ -56,11 +35,5 @@
         <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
         <wait stepKey="waitForFillCVV" time="1"/>
         <switchToIFrame stepKey="switchBackFromCVV"/>
-
-        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
-        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
-        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
-
     </actionGroup>
-
 </actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
@@ -128,7 +128,7 @@
         <data key="firstName">John</data>
         <data key="lastName">Smith</data>
         <data key="password">admin123</data>
-        <data key="email">mail@mail.com</data>
+        <data key="email" unique="prefix">mail@mail.com</data>
     </entity>
 
     <entity name="PaymentAndShippingInfo" type="data">
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-93677"/>
             <group value="braintree"/>
-            <skip>
-                <issueId value="MQE-1187" />
-            </skip>
         </annotations>
 
 
@@ -28,11 +25,13 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
 
             <!--CreateNewProduct-->
-            <actionGroup ref="CreateNewProductActionGroup" stepKey="CreateNewProduct"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
 
             <!--Create New Customer-->
-            <actionGroup ref="CreateCustomerActionGroup" stepKey="CreateCustomer"/>
-
+            <createData stepKey="createCustomer" entity="Simple_US_Customer"/>
         </before>
 
 
@@ -48,30 +47,49 @@
         <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
 
         <!--SignOut-->
-        <actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>
+        <actionGroup ref="logout" stepKey="signOutFromAdmin"/>
 
         <!--SignIn New User-->
         <actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
         <waitForPageLoad stepKey="waitForLogin" time="3"/>
 
         <!--Create New Order-->
-        <actionGroup ref="CreateNewOrderActionGroup" stepKey="createNewOrder"/>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrder">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProduct">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
+
+        <waitForPageLoad stepKey="waitForShippingToFinish"/>
 
+        <actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
+
+        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
+        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
+        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
 
         <after>
+            <!-- Disable BrainTree -->
+            <actionGroup ref="DisableBrainTree" stepKey="disableBrainTree"/>
+
             <!--SignOut-->
             <actionGroup ref="SignOut" stepKey="signOutFromNewUser"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
 
             <!--Delete Product-->
-            <actionGroup ref="DeleteProductActionGroup" stepKey="DeleteAllProducts">
-                <argument name="productName" value="NewProductData.ProductName"/>
-            </actionGroup>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
 
             <!--Delete Customer-->
-            <actionGroup ref="DeleteCustomerActionGroup" stepKey="DeleteCustomer">
-                <argument name="lastName" value="NewCustomerData.LastName"/>
-            </actionGroup>
+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
 
             <!--Delete User -->
             <actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
@@ -80,8 +98,6 @@
             <!--Delete Role-->
             <actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>
             <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="AdminDeleteRoleActionGroup"/>
-
         </after>
-
     </test>
 </tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
@@ -15,9 +15,6 @@
             <description value="Admin should be able to set/edit all the basic product attributes when creating/editing a bundle product"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-222"/>
-            <skip>
-                <issueId value="MQE-1214"/>
-            </skip>
             <group value="Bundle"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
@@ -17,7 +17,7 @@
             <testCaseId value="MC-74"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
@@ -18,7 +18,7 @@
             <testCaseId value="MC-65"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
@@ -78,7 +78,7 @@
             <testCaseId value="MC-93"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
@@ -104,7 +104,7 @@
             <testCaseId value="MC-69"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
@@ -130,7 +130,7 @@
             <testCaseId value="MC-60"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
@@ -156,7 +156,7 @@
             <testCaseId value="MC-71"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
@@ -18,7 +18,7 @@
             <testCaseId value="MC-160"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
@@ -18,7 +18,7 @@
             <testCaseId value="MC-79"/>
             <group value="CatalogRule"/>
             <skip>
-                <issueId value="DEVOPS-3618"/>
+                <issueId value="MC-5777"/>
             </skip>
         </annotations>
         <before>
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
@@ -17,6 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-94479"/>
             <group value="CatalogWidget"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
 
         <before>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
@@ -9,15 +9,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="EnabledWYSIWYG">
-        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToConfigurationPage" />
-        <waitForPageLoad stepKey="wait1"/>
-        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
-        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
-        <waitForElementVisible  selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="waitForUseSystemValueVisible"/>
-        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
-        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Enabled by Default" stepKey="selectOption1"/>
-        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
-        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+        <magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
     </actionGroup>
     <actionGroup name="SwitchToTinyMCE3">
     <comment userInput="Choose TinyMCE3 as the default editor" stepKey="chooseTinyMCE3AsEditor"/>
@@ -31,14 +23,7 @@
     <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
     </actionGroup>
     <actionGroup name="DisabledWYSIWYG">
-        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToConfigurationPage" />
-        <waitForPageLoad stepKey="wait3"/>
-        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
-        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown2" time="30"/>
-        <uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
-        <selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Disabled Completely" stepKey="selectOption2"/>
-        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
-        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+        <magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
     </actionGroup>
     <actionGroup name="UseStaticURLForMediaContentInWYSIWYG">
         <arguments>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
@@ -12,6 +12,7 @@
             <argument name="customerEmail"/>
         </arguments>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
         <click stepKey="chooseCustomer" selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}"/>
         <click stepKey="openActions" selector="{{AdminCustomerGridMainActionsSection.actions}}"/>
         <waitForPageLoad stepKey="waitActions"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
@@ -15,6 +15,6 @@
         <element name="emailInput" type="input" selector="input[name=email]"/>
         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="clearAllFilters" type="text" selector=".admin__current-filters-actions-wrap.action-clear"/>
-        <element name="clearAll" type="button" selector=".action-tertiary.action-clear"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
@@ -18,9 +18,6 @@
             <testCaseId value="MC-124"/>
             <group value="Downloadable"/>
             <group value="WYSIWYGDisabled"/>
-            <skip>
-                <issueId value="MQE-1187"/>
-            </skip>
         </annotations>
 
         <!-- A Cms page containing the New Products Widget gets created here via extends -->
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -280,6 +280,7 @@
         <waitForPageLoad stepKey="waitForStoresPageOpened"/>
         <click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
+        <waitForPageLoad stepKey="waitForStoreToAppear"/>
         <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
         <waitForPageLoad stepKey="waitForProductsListForOrder"/>
         <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -312,6 +312,7 @@
             <argument name="Address" value="US_Address_CA"/>
         </actionGroup>
         <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForAddressToLoad"/>
         <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
         <see stepKey="seeShipTo" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxCA.state}}"/>
 
@@ -329,6 +330,7 @@
             <argument name="Address" value="US_Address_NY"/>
         </actionGroup>
         <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForShippingToLoad"/>
         <see stepKey="seeShipTo2" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxNY.state}}"/>
 
         <!-- Assert that taxes are applied correctly for NY -->
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
@@ -7,7 +7,6 @@
 -->
 <actionGroups 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/actionGroupSchema.xsd">
-
     <actionGroup name="GoToUserRoles">
         <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
         <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -20,15 +19,14 @@
         <arguments>
             <argument name="role" type="string" defaultValue=""/>
             <argument name="resource" type="string" defaultValue="All"/>
-            <argument name="scope" type="string" defaultValue="Custom"/>
-            <argument name="websites" type="string" defaultValue="Main Website"/>
         </arguments>
         <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
         <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
         <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
         <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
-        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
+        <click selector="{{AdminCreateRoleSection.roleScope}}" stepKey="clickToExpandScopeAccess"/>
+        <click selector="{{AdminCreateRoleSection.scopeValue(resource)}}" stepKey="clickToSelectScopeAccess"/>
         <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You saved the role." stepKey="seeSuccessMessage" />
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
@@ -42,8 +42,8 @@
 
     <!--Delete User-->
     <actionGroup name="AdminDeleteUserActionGroup">
-
         <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
+        <waitForPageLoad stepKey="waitForUserPageToLoad"/>
         <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
@@ -52,5 +52,4 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
     </actionGroup>
-
 </actionGroups>
