Skip to content

Commit b64821c

Browse files
Manjusha.SManjusha.S
Manjusha.S
authored and
Manjusha.S
committed
Merge branch 'AC-4061' into functional-testing-automation
2 parents ae94ec3 + f338d7e commit b64821c

15 files changed

+472
-2
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<element name="mapPrice" type="text" selector="//div[@class='price-box price-final_price']//span[contains(@class, 'price-msrp_price')]"/>
3636
<element name="clickForPriceLink" type="text" selector="//div[@class='price-box price-final_price']//a[contains(text(), 'Click for price')]"/>
3737
<element name="addReviewLink" type="text" selector="//div[@class='reviews-actions']//a[@class='action add']"/>
38+
<element name="fptPrice" type="text" selector=".//*[@class='weee']/span"/>
3839

3940
<!-- The parameter is the nth custom option that you want to get -->
4041
<element name="nthCustomOption" type="block" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]" parameterized="true" />

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,8 @@
3939
<element name="estimateShippingAndTaxForm" type="block" selector="#shipping-zip-form"/>
4040
<element name="proceedToCheckoutDisabled" type="button" selector=".action.primary.checkout.disabled" timeout="60"/>
4141
<element name="checkoutWithMultipleAddresses" type="button" selector=".cart-summary .action.multicheckout"/>
42+
<element name="fptAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='totals']//td[@class='amount']/span"/>
43+
<element name="canadaTaxAmount" type="text" selector="//span[@data-th='Canada-GST-5%']"/>
44+
<element name="canadaPstTaxAmount" type="text" selector="//span[@data-th='Canada-GST-PST-5%']"/>
4245
</section>
4346
</sections>

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,4 +446,21 @@
446446
<data key="postcode">12345</data>
447447
<data key="telephone">512-345-6789</data>
448448
</entity>
449+
<entity name="Canada_Address" type="address">
450+
<data key="firstname">John</data>
451+
<data key="lastname">Doe</data>
452+
<array key="street">
453+
<item>4423 St. John Street</item>
454+
<item>113</item>
455+
</array>
456+
<data key="company">Magento</data>
457+
<data key="city">Alameda</data>
458+
<data key="state">Saskatchewan</data>
459+
<data key="country_id">CA</data>
460+
<data key="country">Canada</data>
461+
<data key="postcode">S4P3Y2</data>
462+
<data key="default_shipping">true</data>
463+
<data key="default_billing">true</data>
464+
<data key="telephone">613-582-4782</data>
465+
</entity>
449466
</entities>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,4 +460,18 @@
460460
<entity name="Simple_US_Customer_US_UK_Addresses" type="customer" extends="Simple_US_Customer_ArmedForcesEurope">
461461
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
462462
</entity>
463+
<entity name="Simple_CA_Customer" type="customer">
464+
<data key="group_id">1</data>
465+
<data key="default_billing">true</data>
466+
<data key="default_shipping">true</data>
467+
<data key="email" unique="prefix">[email protected]</data>
468+
<data key="firstname">John</data>
469+
<data key="lastname">Doe</data>
470+
<data key="fullname">John Doe</data>
471+
<data key="password">pwdTest123!</data>
472+
<data key="store_id">0</data>
473+
<data key="website_id">0</data>
474+
<data key="group">General</data>
475+
<requiredEntity type="address">Canada_Address</requiredEntity>
476+
</entity>
463477
</entities>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,10 @@
3232
<element name="grandTotal" type="text" selector="//tr[@class='grand_total']//td[@data-th='Grand Total']"/>
3333
<element name="pagerLink" type="text" selector=".pager a.page[href*='order_id/{{orderId}}/?p={{pageNumber}}']" parameterized="true"/>
3434
<element name="itemCountOnPage" type="text" selector="#my-orders-table tbody"/>
35+
<element name="subTotal" type="text" selector="//tr[@class='subtotal']//td[@data-th='Subtotal']/span"/>
36+
<element name="shipping" type="text" selector="//tr[@class='shipping']//td[@data-th='Shipping &amp; Handling']/span"/>
37+
<element name="FPT" type="text" selector="//tr[@class='weee_ord_totals']//td[@data-th='FPT']/span"/>
38+
<element name="taxRule" type="text" selector="//table[contains(@class, 'data table table-order-items')]//td[normalize-space(.)='Canada-GST-5% (5%)']/following-sibling::td//span[@class='price']"/>
39+
<element name="taxRule1" type="text" selector="//table[contains(@class, 'data table table-order-items')]//td[normalize-space(.)='Canada-GST-PST-5% (5%)']/following-sibling::td//span[@class='price']"/>
3540
</section>
3641
</sections>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,9 @@
1515
<element name="shippingDescription" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[contains(text(), 'Shipping &amp; Handling')]"/>
1616
<element name="shippingAndHandling" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Shipping &amp; Handling']/following-sibling::td//span[@class='price']"/>
1717
<element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
18+
<element name="totalTax" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Total Tax']/following-sibling::td//span[@class='price']"/>
19+
<element name="fpt" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='FPT']/following-sibling::td//span[@class='price']"/>
20+
<element name="taxRule1" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Canada-GST-5% (5%)']/following-sibling::td//span[@class='price']"/>
21+
<element name="taxRule2" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[normalize-space(.)='Canada-GST-PST-5% (5%)']/following-sibling::td//span[@class='price']"/>
1822
</section>
19-
</sections>
23+
</sections>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminSetShippingOriginConfigActionGroup.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSetShippingOriginConfigActionGroup">
12+
<!-- navigate to the tax configuration page -->
13+
<amOnPage url="{{AdminShippingSettingsPage.url}}" stepKey="goToAdminShippingPage"/>
14+
<waitForPageLoad stepKey="waitForShippingConfigLoad"/>
15+
<conditionalClick selector="{{AdminShippingSettingsConfigSection.Origin}}" dependentSelector="{{AdminShippingSettingsConfigSection.OriginOpened}}" visible="false" stepKey="openPriceDisplaySettings"/>
16+
<uncheckOption stepKey="clickCountry" selector="{{AdminShippingSettingsConfigSection.systemValueCountry}}"/>
17+
<waitForPageLoad stepKey="waitForUncheck"/>
18+
<selectOption selector="{{AdminShippingSettingsConfigSection.dropdownCountry}}" userInput="Canada" stepKey="SelectCountry"/>
19+
<uncheckOption stepKey="clickState" selector="{{AdminShippingSettingsConfigSection.systemValueState}}"/>
20+
<wait stepKey="WaitForUncheckStateSystemValue" time="10"/>
21+
<selectOption selector="{{AdminShippingSettingsConfigSection.dropdownState}}" userInput="Saskatchewan" stepKey="SelectState"/>
22+
<uncheckOption stepKey="clickPostcode" selector="{{AdminShippingSettingsConfigSection.systemValuePostcode}}"/>
23+
<wait stepKey="waitForUncheckSystemPostcode" time="10"/>
24+
<fillField selector="{{AdminShippingSettingsConfigSection.PostcodeValue}}" userInput="S4P3Y2" stepKey="fillPostcode"/>
25+
<!-- Save the settings -->
26+
<scrollToTopOfPage stepKey="scrollToTop"/>
27+
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveChanges"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/Data/AdminShippingSettingsConfigData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,7 @@
6060
<data key="path">tax/cart_display/shipping</data>
6161
<data key="value">1</data>
6262
</entity>
63+
<entity name="AdminShippingSettingsOriginRegionConfigData">
64+
<data key="path">shipping/origin/region_id</data>
65+
</entity>
6366
</entities>

‎app/code/Magento/Shipping/Test/Mftf/Page/AdminShippingSettingsPage.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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="AdminShippingSettingsPage" url="admin/system_config/edit/section/shipping/" area="admin" module="Magento_Shipping">
12+
<section name="AdminShippingSettingsConfigSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingSettingsConfigSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminShippingSettingsConfigSection">
11+
<element name="Origin" type="block" selector="#shipping_origin-head" timeout="30"/>
12+
<element name="OriginOpened" type="block" selector="#shipping_origin-head.open" timeout="30"/>
13+
<element name="systemValueCountry" type="checkbox" selector="#row_shipping_origin_country_id input[type='checkbox']"/>
14+
<element name="dropdownCountry" type="select" selector="#row_shipping_origin_country_id select"/>
15+
<element name="systemValueState" type="checkbox" selector="#row_shipping_origin_region_id input[type='checkbox']"/>
16+
<element name="dropdownState" type="checkbox" selector="#row_shipping_origin_region_id select"/>
17+
<element name="systemValuePostcode" type="checkbox" selector="#row_shipping_origin_postcode input[type='checkbox']"/>
18+
<element name="PostcodeValue" type="input" selector="#row_shipping_origin_postcode input[type='text']"/>
19+
</section>
20+
</sections>

0 commit comments

Comments
 (0)