Skip to content

Commit 2d2d906

Browse files
KevinBKozanKevinBKozan
committed
Merge branch 'MQE-1187' of https://github.com/magento-pangolin/magento2ce into MQE-1187
2 parents 30f8f18 + 793d49c commit 2d2d906

File tree

7 files changed

+36
-69
lines changed

7 files changed

+36
-69
lines changed

‎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: 29 additions & 14 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,46 @@
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"/>
73+
74+
<actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
5975

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>
6281
<!--SignOut-->
6382
<actionGroup ref="SignOut" stepKey="signOutFromNewUser"/>
6483
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
6584

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

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

7691
<!--Delete User -->
7792
<actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>

‎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/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/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)