Skip to content

Commit

Permalink
Merge pull request #50 from magento-epam/2.3-develop
Browse files Browse the repository at this point in the history
2.3-develop
  • Loading branch information
vital-pantsialeyeu authored Aug 14, 2018
2 parents 9e726c3 + 8c1bd4c commit 830007d
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</actionGroup>

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

</actionGroups>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-->

<tests 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/testSchema.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="CreateAnAdminOrderUsingBraintreePaymentTest1">
<annotations>
<features value="Backend"/>
Expand All @@ -17,6 +17,9 @@
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-93677"/>
<group value="braintree"/>
<skip>
<issueId value="MQE-1187" />
</skip>
</annotations>


Expand All @@ -42,7 +45,7 @@

<!--Create New User With Specific Role-->
<actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
<actionGroup ref="AdminCreateUser" stepKey="AdminCreateNewUser"/>
<actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>

<!--SignOut-->
<actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-->

<tests 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/testSchema.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="StorefrontCustomerCheckoutTest">
<annotations>
<features value="Checkout"/>
Expand Down Expand Up @@ -88,6 +88,9 @@
<title value="Customer Checkout with multiple addresses and tax rates"/>
<description value="Should be able to place an order as a customer with multiple addresses and tax rates."/>
<testCaseId value="MAGETWO-93109"/>
<skip>
<issueId value="MQE-1187" />
</skip>
</annotations>
<before>
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<description value="Admin should be able to add image to WYSIWYG content of Block"/>
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-84376"/>
<skip>
<issueId value="MQE-1187" />
</skip>
</annotations>
<before>
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"zendframework/zend-view": "~2.10.0"
},
"require-dev": {
"magento/magento2-functional-testing-framework": "2.3.3",
"magento/magento2-functional-testing-framework": "2.3.4",
"friendsofphp/php-cs-fixer": "~2.12.0",
"lusitanian/oauth": "~0.8.10",
"pdepend/pdepend": "2.5.2",
Expand Down
88 changes: 44 additions & 44 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 830007d

Please sign in to comment.