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

Commit 830007d

Browse files
Merge pull request #50 from magento-epam/2.3-develop
2.3-develop
2 parents 9e726c3 + 8c1bd4c commit 830007d

File tree

8 files changed

+100
-65
lines changed

8 files changed

+100
-65
lines changed

app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</actionGroup>
1818

1919
<!--Create new user with specified role-->
20-
<actionGroup name="AdminCreateUser">
20+
<actionGroup name="AdminCreateUserAction">
2121
<click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
2222
<waitForPageLoad stepKey="waitForNewUserPageLoad" time="10"/>
2323
<fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{NewAdmin.username}}" stepKey="enterUserName" />
@@ -53,4 +53,4 @@
5353
<see userInput="You deleted the user." stepKey="seeSuccessMessage" />
5454
</actionGroup>
5555

56-
</actionGroups>
56+
</actionGroups>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="CreateAnAdminOrderUsingBraintreePaymentTest1">
1212
<annotations>
1313
<features value="Backend"/>
@@ -17,6 +17,9 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-93677"/>
1919
<group value="braintree"/>
20+
<skip>
21+
<issueId value="MQE-1187" />
22+
</skip>
2023
</annotations>
2124

2225

@@ -42,7 +45,7 @@
4245

4346
<!--Create New User With Specific Role-->
4447
<actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
45-
<actionGroup ref="AdminCreateUser" stepKey="AdminCreateNewUser"/>
48+
<actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
4649

4750
<!--SignOut-->
4851
<actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="StorefrontCustomerCheckoutTest">
1212
<annotations>
1313
<features value="Checkout"/>
@@ -88,6 +88,9 @@
8888
<title value="Customer Checkout with multiple addresses and tax rates"/>
8989
<description value="Should be able to place an order as a customer with multiple addresses and tax rates."/>
9090
<testCaseId value="MAGETWO-93109"/>
91+
<skip>
92+
<issueId value="MQE-1187" />
93+
</skip>
9194
</annotations>
9295
<before>
9396
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<description value="Admin should be able to add image to WYSIWYG content of Block"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-84376"/>
19+
<skip>
20+
<issueId value="MQE-1187" />
21+
</skip>
1922
</annotations>
2023
<before>
2124
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"zendframework/zend-view": "~2.10.0"
8282
},
8383
"require-dev": {
84-
"magento/magento2-functional-testing-framework": "2.3.3",
84+
"magento/magento2-functional-testing-framework": "2.3.4",
8585
"friendsofphp/php-cs-fixer": "~2.12.0",
8686
"lusitanian/oauth": "~0.8.10",
8787
"pdepend/pdepend": "2.5.2",

composer.lock

Lines changed: 44 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)