Skip to content

Commit 6fc3812

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MAGETWO-86470' into 2.2-develop-pr33
2 parents b40c1ba + f937dfa commit 6fc3812

File tree

14 files changed

+255
-1
lines changed

14 files changed

+255
-1
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SortByIdDescendingActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="SortByIdDescendingActionGroup">
12+
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
13+
<waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
14+
<!-- Conditional Click again in case it goes from default state to ascending on first click -->
15+
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending" visible="true"/>
16+
<waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish" />
17+
</actionGroup>
18+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminGridTableSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminGridTableSection">
12+
<element name="row" type="text" selector="table.data-grid tbody tr[data-role=row]:nth-of-type({{row}})" parameterized="true"/>
13+
</section>
14+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminMainActionsSection">
12+
<element name="save" type="button" selector="#save"/>
13+
<element name="delete" type="button" selector="#delete"/>
14+
</section>
15+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
<section name="StorefrontProductActionSection">
11+
<element name="quantity" type="input" selector="#qty"/>
12+
<element name="addToCart" type="button" selector="#product-addtocart-button"/>
13+
<element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
14+
<element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
15+
<element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
16+
</section>
17+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/CheckoutActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<!-- Checkout place order -->
12+
<actionGroup name="CheckoutPlaceOrderActionGroup">
13+
<arguments>
14+
<argument name="orderNumberMessage"/>
15+
<argument name="emailYouMessage"/>
16+
</arguments>
17+
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
18+
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
19+
<see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{orderNumberMessage}}" stepKey="seeOrderNumber"/>
20+
<see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>
21+
</actionGroup>
22+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/ConstData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
12+
<entity name="CONST" type="CONST">
13+
<data key="successGuestCheckoutOrderNumberMessage">Your order # is:</data>
14+
<data key="successCheckoutOrderNumberMessage">Your order number is:</data>
15+
<data key="successCheckoutEmailYouMessage">We'll email you an order confirmation with details and tracking info.</data>
16+
</entity>
17+
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<item>7700 West Parmer Lane</item>
4242
</array>
4343
<data key="city">Austin</data>
44+
<data key="state">Texas</data>
4445
<data key="country_id">US</data>
4546
<data key="postcode">78729</data>
4647
<data key="telephone">512-345-6789</data>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<!--Cancel order that is in pending status-->
12+
<actionGroup name="cancelPendingOrder">
13+
<click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
14+
<waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForCancelConfirmation"/>
15+
<see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to cancel this order?" stepKey="seeConfirmationMessage"/>
16+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrderCancel"/>
17+
<see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
18+
<see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
19+
</actionGroup>
20+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInformationSection.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminOrderDetailsInformationSection">
12+
<element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
13+
<element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
14+
<element name="purchasedFrom" type="text" selector=".order-information table.order-information-table tr:last-of-type > td"/>
15+
<element name="accountInformation" type="text" selector=".order-account-information-table"/>
16+
<element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
17+
<element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
18+
<element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
19+
<element name="billingAddress" type="text" selector=".order-billing-address"/>
20+
<element name="shippingAddress" type="text" selector=".order-shipping-address"/>
21+
<element name="itemsOrdered" type="text" selector=".edit-order-table"/>
22+
</section>
23+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMainActionsSection.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminOrderDetailsMainActionsSection">
12+
<element name="back" type="button" selector="#back" timeout="30"/>
13+
<element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
14+
<element name="sendEmail" type="button" selector="#send_notification" timeout="30"/>
15+
<element name="creditMemo" type="button" selector="#order_creditmemo" timeout="30"/>
16+
<element name="hold" type="button" selector="#order-view-hold-button" timeout="30"/>
17+
<element name="invoice" type="button" selector="#order_invoice" timeout="30"/>
18+
<element name="ship" type="button" selector="#order_ship" timeout="30"/>
19+
<element name="reorder" type="button" selector="#order_reorder" timeout="30"/>
20+
<element name="edit" type="button" selector="#order_edit" timeout="30"/>
21+
</section>
22+
</sections>

0 commit comments

Comments
 (0)