niravkrish · niravkrish · Feb 6, 2019 · Jan 26, 2019 · Jan 26, 2019 · Jan 26, 2019
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SetAdminAccountActionGroup">
+        <arguments>
+            <argument name="InterfaceLocaleByValue" type="string"/>
+        </arguments>
+        <!-- Navigate to admin System Account Page-->
+        <amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" />
+        <waitForPageLoad stepKey="loadAdminSystemAccountPage"/>
+        <!-- Change Admin locale to Français (France) / French (France) -->
+        <selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/>
+        <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/>
+        <waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <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">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
         <section name="AdminMenuSection"/>
     </page>

diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemAccountPage" url="admin/system_account/index/" area="admin" module="Magento_Backend">
+        <section name="AdminSystemAccountSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSystemAccountSection">
+        <element name="interfaceLocale" type="text" selector="#interface_locale"/>
+        <element name="currentPassword" type="text" selector="#current_password"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
@@ -11,5 +11,6 @@
     <section name="LocaleOptionsSection">
         <element name="sectionHeader" type="text" selector="#general_locale-head"/>
         <element name="timezone" type="select" selector="#general_locale_timezone"/>
+        <element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -5,9 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-
     <actionGroup name="AdminOrderBraintreeFillActionGroup">
         <!--Select Braintree Payment method on Admin Order Create Page-->
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
@@ -39,4 +39,4 @@
         <wait stepKey="waitForFillCVV" time="1"/>
         <switchToIFrame stepKey="switchBackFromCVV"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>
diff --git a/...Mftf/ActionGroup/AdminRoleActionGroup.xml → ...Mftf/ActionGroup/AdminRoleActionGroup.xml b/...Mftf/ActionGroup/AdminRoleActionGroup.xml → ...Mftf/ActionGroup/AdminRoleActionGroup.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <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="GoToUserRoles">
         <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
         <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -15,24 +16,24 @@
     </actionGroup>
 
     <!--Create new role-->
-    <actionGroup name="AdminCreateRole">
+    <actionGroup name="AdminCreateNewRole">
         <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 selector="{{AdminCreateRoleSection.roleScope}}" stepKey="clickToExpandScopeAccess"/>
-        <click selector="{{AdminCreateRoleSection.scopeValue(resource)}}" stepKey="clickToSelectScopeAccess"/>
+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
         <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You saved the role." stepKey="seeSuccessMessage" />
     </actionGroup>
 
-
     <!--Delete role-->
     <actionGroup name="AdminDeleteRoleActionGroup">
         <arguments>
@@ -46,4 +47,4 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
     </actionGroup>
-</actionGroups>
+</actionGroups>
diff --git a/...Mftf/ActionGroup/AdminUserActionGroup.xml → ...Mftf/ActionGroup/AdminUserActionGroup.xml b/...Mftf/ActionGroup/AdminUserActionGroup.xml → ...Mftf/ActionGroup/AdminUserActionGroup.xml
@@ -5,9 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<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">
 
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Go to all users-->
     <actionGroup name="GoToAllUsers">
         <click selector="{{AdminCreateUserSection.system}}" stepKey="clickOnSystemIcon"/>
@@ -39,11 +39,10 @@
         <see userInput="You saved the user." stepKey="seeSuccessMessage" />
     </actionGroup>
 
-
     <!--Delete User-->
-    <actionGroup name="AdminDeleteUserActionGroup">
+    <actionGroup name="AdminDeleteNewUserActionGroup">
+
         <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,4 +51,5 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
     </actionGroup>
+
 </actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
@@ -6,24 +6,27 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontFillCartDataActionGroup">
         <arguments>
             <argument name="cartData" defaultValue="PaymentAndShippingInfo"/>
         </arguments>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.cartFrame}}" stepKey="switchToIframe"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.cartCode}}" stepKey="waitCartCodeElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.cartCode}}" userInput="{{cartData.cardNumber}}" stepKey="setCartCode"/>
         <switchToIFrame stepKey="switchBack"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.monthFrame}}" stepKey="switchToIframe1"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.month}}" stepKey="waitMonthElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.month}}" userInput="{{cartData.month}}" stepKey="setMonth"/>
         <switchToIFrame stepKey="switchBack1"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.yearFrame}}" stepKey="switchToIframe2"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.year}}" stepKey="waitYearElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.year}}" userInput="{{cartData.year}}" stepKey="setYear"/>
         <switchToIFrame stepKey="switchBack2"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.codeFrame}}" stepKey="switchToIframe3"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" stepKey="waitVerificationNumber"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" userInput="{{cartData.cvv}}" stepKey="setVerificationNumber"/>
         <switchToIFrame stepKey="SwitchBackToWindow"/>
-
     </actionGroup>
 
 </actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditRoleInfoSection">
+        <element name="roleName" type="input" selector="#role_name"/>
+        <element name="password" type="input" selector="#current_password"/>
+        <element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
+        <element name="backButton" type="button" selector="button[title='Back']"/>
+        <element name="resetButton" type="button" selector="button[title='Reset']"/>
+        <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
+        <element name="saveButton" type="button" selector="button[title='Save Role']"/>
+        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
+        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
+        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditUserRoleSection">
+        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditUserSection">
+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
+        <element name="create" type="input" selector="#add"/>
+        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
+        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
+        <element name="emailTextField" type="input" selector="#user_email"/>
+        <element name="passwordTextField" type="input" selector="#user_password"/>
+        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
+        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
+        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+        <element name="saveButton" type="button" selector="#save"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMenuSection">
+        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
+        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
+        <element name="catalog" type="button" selector="//li[@id='menu-magento-catalog-catalog']"/>
+        <element name="customers" type="button" selector="//li[@id='menu-magento-customer-customer']"/>
+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
+        <element name="content" type="button" selector="//li[@id='menu-magento-backend-content']"/>
+        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
+        <element name="stores" type="button" selector="//li[@id='menu-magento-backend-stores']"/>
+        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
+        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminRoleGridSection">
+        <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
+        <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
@@ -5,6 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BraintreeConfiguraionSection">
@@ -30,6 +31,5 @@
         <element name="actionAuthorize" type="text" selector="//select[@id='payment_us_braintree_section_braintree_braintree_paypal_payment_action']/option[text()='Authorize']"/>
         <element name="save" type="button" selector="//span[text()='Save Config']"/>
         <element name="successfulMessage" type="text" selector="//*[@data-ui-id='messages-message-success']"/>
-
     </section>
-</sections>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
@@ -8,7 +8,7 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-         <section name="ConfigurationPaymentSection">
+    <section name="ConfigurationPaymentSection">
         <element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
     </section>
 </sections>
diff --git a/.../Mftf/Section/StorefrontHeaderSection.xml → ...est/Mftf/Section/StoresSubmenuSection.xml b/.../Mftf/Section/StorefrontHeaderSection.xml → ...est/Mftf/Section/StoresSubmenuSection.xml
@@ -8,6 +8,7 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="StorefrontHeaderSection">
+    <section name="StoresSubmenuSection">
+        <element name="configuration" type="button" selector="//li[@id='menu-magento-backend-stores']//li[@data-ui-id='menu-magento-config-system-config']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-93677"/>
             <group value="braintree"/>
+            <skip>
+                <issueId value="MC-13779"/>
+            </skip>
         </annotations>
 
 
@@ -40,16 +43,18 @@
 
         <!--Create New Role-->
         <actionGroup ref="GoToUserRoles" stepKey="GoToUserRoles"/>
-        <actionGroup ref="AdminCreateRole" stepKey="AdminCreateNewRole"/>
+        <waitForPageLoad stepKey="waitForAllRoles" time="15"/>
+        <actionGroup ref="AdminCreateNewRole" stepKey="AdminCreateNewRole"/>
 
-        <!--Create New User With Specific Role-->
+        <!--Create new admin user-->
         <actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
+        <waitForPageLoad stepKey="waitForUsers" time="15"/>
         <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
 
         <!--SignOut-->
         <actionGroup ref="logout" stepKey="signOutFromAdmin"/>
 
-        <!--SignIn New User-->
+        <!--Log in as new user-->
         <actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
         <waitForPageLoad stepKey="waitForLogin" time="3"/>
 
@@ -93,7 +98,7 @@
 
             <!--Delete User -->
             <actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
-            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
+            <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
 
             <!--Delete Role-->
             <actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>