Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 6ea3d2f

Browse files
KevinBKozanKevinBKozan
authored
Merge pull request #3468 from magento-pangolin/MQE-1187
[pangolin] MQE-1187: Fix MFTF skipped tests
2 parents 733f2fc + bf864f6 commit 6ea3d2f

18 files changed

+58
-84
lines changed

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010

1111
<actionGroup name="ConfigureBraintree">
1212
<!-- GoTo ConfigureBraintree fields -->
@@ -46,4 +46,8 @@
4646
<waitForElementVisible selector="{{BraintreeConfiguraionSection.successfulMessage}}" stepKey="waitForSuccessfullyConfigured" time="10"/>
4747
</actionGroup>
4848

49+
<actionGroup name="DisableBrainTree">
50+
<magentoCLI stepKey="disableBrainTree" command="config:set payment/braintree/active 0"/>
51+
<magentoCLI stepKey="disableBrainTreePaypal" command="config:set payment/braintree_paypal/active 0"/>
52+
</actionGroup>
4953
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,7 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1010

11-
<actionGroup name="CreateNewOrderActionGroup">
12-
<click stepKey="createNewOrder" selector="{{NewOrderSection.createNewOrder}}"/>
13-
<waitForPageLoad stepKey="waitForCustomersList" time="3"/>
14-
<click stepKey="chooseCustomer" selector="{{NewOrderSection.customer}}"/>
15-
<waitForPageLoad stepKey="waitForOrderPage" time="3"/>
16-
<click stepKey="addProducts" selector="{{NewOrderSection.addProducts}}"/>
17-
<waitForPageLoad stepKey="waitForProducts" time="3"/>
18-
<click stepKey="chooseProducts" selector="{{NewOrderSection.chooseProduct}}"/>
19-
<waitForPageLoad stepKey="waitForProductChoose" time="3"/>
20-
<click stepKey="addSelectedProduct" selector="{{NewOrderSection.addSelectedProduct}}"/>
21-
<waitForAjaxLoad stepKey="waitForChoose" time="3"/>
22-
<click stepKey="openAddresses" selector="{{NewOrderSection.openAddresses}}"/>
23-
<click stepKey="chooseAddress" selector="{{NewOrderSection.chooseAddress}}"/>
24-
<fillField stepKey="fillState" selector="{{NewOrderSection.state}}" userInput="Yerevan"/>
25-
<scrollTo stepKey="scrollTo" selector="#order-methods"/>
26-
<waitForPageLoad stepKey="waitForMethods" time="3"/>
27-
<click stepKey="startJSMethodExecution" selector="{{NewOrderSection.openShippingMethods}}"/>
28-
<waitForPageLoad stepKey="waitForJSMethodExecution" time="3"/>
29-
<click stepKey="openShippingMethods" selector="{{NewOrderSection.openShippingMethods}}"/>
30-
<waitForPageLoad stepKey="waitForShippingMethods" time="3"/>
31-
<click stepKey="chooseShippingMethods" selector="{{NewOrderSection.shippingMethod}}"/>
32-
<waitForPageLoad stepKey="waitForShippingMethodChoose" time="4"/>
11+
<actionGroup name="useBraintreeForMasterCard">
3312
<click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
3413
<waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
3514
<click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
@@ -56,11 +35,5 @@
5635
<fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
5736
<wait stepKey="waitForFillCVV" time="1"/>
5837
<switchToIFrame stepKey="switchBackFromCVV"/>
59-
60-
<click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
61-
<waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
62-
<waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
63-
6438
</actionGroup>
65-
6639
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<data key="firstName">John</data>
129129
<data key="lastName">Smith</data>
130130
<data key="password">admin123</data>
131-
<data key="email">[email protected]</data>
131+
<data key="email" unique="prefix">[email protected]</data>
132132
</entity>
133133

134134
<entity name="PaymentAndShippingInfo" type="data">

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

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-93677"/>
1919
<group value="braintree"/>
20-
<skip>
21-
<issueId value="MQE-1187" />
22-
</skip>
2320
</annotations>
2421

2522

@@ -28,11 +25,13 @@
2825
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2926

3027
<!--CreateNewProduct-->
31-
<actionGroup ref="CreateNewProductActionGroup" stepKey="CreateNewProduct"/>
28+
<createData entity="_defaultCategory" stepKey="createCategory"/>
29+
<createData entity="_defaultProduct" stepKey="createProduct">
30+
<requiredEntity createDataKey="createCategory"/>
31+
</createData>
3232

3333
<!--Create New Customer-->
34-
<actionGroup ref="CreateCustomerActionGroup" stepKey="CreateCustomer"/>
35-
34+
<createData stepKey="createCustomer" entity="Simple_US_Customer"/>
3635
</before>
3736

3837

@@ -48,30 +47,49 @@
4847
<actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
4948

5049
<!--SignOut-->
51-
<actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>
50+
<actionGroup ref="logout" stepKey="signOutFromAdmin"/>
5251

5352
<!--SignIn New User-->
5453
<actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
5554
<waitForPageLoad stepKey="waitForLogin" time="3"/>
5655

5756
<!--Create New Order-->
58-
<actionGroup ref="CreateNewOrderActionGroup" stepKey="createNewOrder"/>
57+
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrder">
58+
<argument name="customer" value="Simple_US_Customer"/>
59+
</actionGroup>
60+
61+
<actionGroup ref="addSimpleProductToOrder" stepKey="addProduct">
62+
<argument name="product" value="_defaultProduct"/>
63+
</actionGroup>
64+
65+
<actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
66+
<argument name="customer" value="Simple_US_Customer"/>
67+
<argument name="address" value="US_Address_TX"/>
68+
</actionGroup>
69+
70+
<actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
71+
72+
<waitForPageLoad stepKey="waitForShippingToFinish"/>
5973

74+
<actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
75+
76+
<click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
77+
<waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
78+
<waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
6079

6180
<after>
81+
<!-- Disable BrainTree -->
82+
<actionGroup ref="DisableBrainTree" stepKey="disableBrainTree"/>
83+
6284
<!--SignOut-->
6385
<actionGroup ref="SignOut" stepKey="signOutFromNewUser"/>
6486
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
6587

6688
<!--Delete Product-->
67-
<actionGroup ref="DeleteProductActionGroup" stepKey="DeleteAllProducts">
68-
<argument name="productName" value="NewProductData.ProductName"/>
69-
</actionGroup>
89+
<deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
7090

7191
<!--Delete Customer-->
72-
<actionGroup ref="DeleteCustomerActionGroup" stepKey="DeleteCustomer">
73-
<argument name="lastName" value="NewCustomerData.LastName"/>
74-
</actionGroup>
92+
<deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
7593

7694
<!--Delete User -->
7795
<actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
@@ -80,8 +98,6 @@
8098
<!--Delete Role-->
8199
<actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>
82100
<actionGroup ref="AdminDeleteRoleActionGroup" stepKey="AdminDeleteRoleActionGroup"/>
83-
84101
</after>
85-
86102
</test>
87103
</tests>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<description value="Admin should be able to set/edit all the basic product attributes when creating/editing a bundle product"/>
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-222"/>
18-
<skip>
19-
<issueId value="MQE-1214"/>
20-
</skip>
2118
<group value="Bundle"/>
2219
</annotations>
2320
<before>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<testCaseId value="MC-74"/>
1818
<group value="CatalogRule"/>
1919
<skip>
20-
<issueId value="DEVOPS-3618"/>
20+
<issueId value="MC-5777"/>
2121
</skip>
2222
</annotations>
2323
<before>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<testCaseId value="MC-65"/>
1919
<group value="CatalogRule"/>
2020
<skip>
21-
<issueId value="DEVOPS-3618"/>
21+
<issueId value="MC-5777"/>
2222
</skip>
2323
</annotations>
2424
<before>
@@ -78,7 +78,7 @@
7878
<testCaseId value="MC-93"/>
7979
<group value="CatalogRule"/>
8080
<skip>
81-
<issueId value="DEVOPS-3618"/>
81+
<issueId value="MC-5777"/>
8282
</skip>
8383
</annotations>
8484
<before>
@@ -104,7 +104,7 @@
104104
<testCaseId value="MC-69"/>
105105
<group value="CatalogRule"/>
106106
<skip>
107-
<issueId value="DEVOPS-3618"/>
107+
<issueId value="MC-5777"/>
108108
</skip>
109109
</annotations>
110110
<before>
@@ -130,7 +130,7 @@
130130
<testCaseId value="MC-60"/>
131131
<group value="CatalogRule"/>
132132
<skip>
133-
<issueId value="DEVOPS-3618"/>
133+
<issueId value="MC-5777"/>
134134
</skip>
135135
</annotations>
136136
<before>
@@ -156,7 +156,7 @@
156156
<testCaseId value="MC-71"/>
157157
<group value="CatalogRule"/>
158158
<skip>
159-
<issueId value="DEVOPS-3618"/>
159+
<issueId value="MC-5777"/>
160160
</skip>
161161
</annotations>
162162
<before>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<testCaseId value="MC-160"/>
1919
<group value="CatalogRule"/>
2020
<skip>
21-
<issueId value="DEVOPS-3618"/>
21+
<issueId value="MC-5777"/>
2222
</skip>
2323
</annotations>
2424
<before>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<testCaseId value="MC-79"/>
1919
<group value="CatalogRule"/>
2020
<skip>
21-
<issueId value="DEVOPS-3618"/>
21+
<issueId value="MC-5777"/>
2222
</skip>
2323
</annotations>
2424
<before>

‎app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-94479"/>
1919
<group value="CatalogWidget"/>
20+
<group value="WYSIWYGDisabled"/>
2021
</annotations>
2122

2223
<before>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="EnabledWYSIWYG">
12-
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToConfigurationPage" />
13-
<waitForPageLoad stepKey="wait1"/>
14-
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
15-
<waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
16-
<waitForElementVisible selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="waitForUseSystemValueVisible"/>
17-
<uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
18-
<selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Enabled by Default" stepKey="selectOption1"/>
19-
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
20-
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
12+
<magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
2113
</actionGroup>
2214
<actionGroup name="SwitchToTinyMCE3">
2315
<comment userInput="Choose TinyMCE3 as the default editor" stepKey="chooseTinyMCE3AsEditor"/>
@@ -31,14 +23,7 @@
3123
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
3224
</actionGroup>
3325
<actionGroup name="DisabledWYSIWYG">
34-
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToConfigurationPage" />
35-
<waitForPageLoad stepKey="wait3"/>
36-
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
37-
<waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown2" time="30"/>
38-
<uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
39-
<selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Disabled Completely" stepKey="selectOption2"/>
40-
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
41-
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
26+
<magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
4227
</actionGroup>
4328
<actionGroup name="UseStaticURLForMediaContentInWYSIWYG">
4429
<arguments>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<argument name="customerEmail"/>
1313
</arguments>
1414
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
15+
<conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
1516
<click stepKey="chooseCustomer" selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}"/>
1617
<click stepKey="openActions" selector="{{AdminCustomerGridMainActionsSection.actions}}"/>
1718
<waitForPageLoad stepKey="waitActions"/>

‎app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<element name="emailInput" type="input" selector="input[name=email]"/>
1616
<element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
1717
<element name="clearAllFilters" type="text" selector=".admin__current-filters-actions-wrap.action-clear"/>
18-
<element name="clearAll" type="button" selector=".action-tertiary.action-clear"/>
18+
<element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear"/>
1919
</section>
2020
</sections>

‎app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<testCaseId value="MC-124"/>
1919
<group value="Downloadable"/>
2020
<group value="WYSIWYGDisabled"/>
21-
<skip>
22-
<issueId value="MQE-1187"/>
23-
</skip>
2421
</annotations>
2522

2623
<!-- A Cms page containing the New Products Widget gets created here via extends -->

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
<waitForPageLoad stepKey="waitForStoresPageOpened"/>
281281
<click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
282282
<scrollToTopOfPage stepKey="scrollToTop"/>
283+
<waitForPageLoad stepKey="waitForStoreToAppear"/>
283284
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
284285
<waitForPageLoad stepKey="waitForProductsListForOrder"/>
285286
<click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@
312312
<argument name="Address" value="US_Address_CA"/>
313313
</actionGroup>
314314
<click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
315+
<waitForPageLoad stepKey="waitForAddressToLoad"/>
315316
<see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
316317
<see stepKey="seeShipTo" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxCA.state}}"/>
317318

@@ -329,6 +330,7 @@
329330
<argument name="Address" value="US_Address_NY"/>
330331
</actionGroup>
331332
<click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
333+
<waitForPageLoad stepKey="waitForShippingToLoad"/>
332334
<see stepKey="seeShipTo2" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxNY.state}}"/>
333335

334336
<!-- Assert that taxes are applied correctly for NY -->

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml renamed to ‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10-
1110
<actionGroup name="GoToUserRoles">
1211
<click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
1312
<waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -20,15 +19,14 @@
2019
<arguments>
2120
<argument name="role" type="string" defaultValue=""/>
2221
<argument name="resource" type="string" defaultValue="All"/>
23-
<argument name="scope" type="string" defaultValue="Custom"/>
24-
<argument name="websites" type="string" defaultValue="Main Website"/>
2522
</arguments>
2623
<click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
2724
<fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
2825
<fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
2926
<click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
3027
<waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
31-
<click stepKey="checkSales" selector="//a[text()='Sales']"/>
28+
<click selector="{{AdminCreateRoleSection.roleScope}}" stepKey="clickToExpandScopeAccess"/>
29+
<click selector="{{AdminCreateRoleSection.scopeValue(resource)}}" stepKey="clickToSelectScopeAccess"/>
3230
<click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
3331
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
3432
<see userInput="You saved the role." stepKey="seeSuccessMessage" />

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml renamed to ‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242

4343
<!--Delete User-->
4444
<actionGroup name="AdminDeleteUserActionGroup">
45-
4645
<click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
46+
<waitForPageLoad stepKey="waitForUserPageToLoad"/>
4747
<fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
4848
<scrollToTopOfPage stepKey="scrollToTop"/>
4949
<click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
@@ -52,5 +52,4 @@
5252
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
5353
<see userInput="You deleted the user." stepKey="seeSuccessMessage" />
5454
</actionGroup>
55-
5655
</actionGroups>

0 commit comments

Comments
 (0)