Skip to content

Commit b67ae91

Browse files
akaashakaash
akaash
authored and
akaash
committed
Conflict Resolve
2 parents 56ba186 + 6325a78 commit b67ae91

14 files changed

+207
-0
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminCheckCurrencyDefaultSystemValuesActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCheckCurrencyDefaultSystemValuesActionGroup">
12+
<annotations>
13+
<description> Admin check default currency system values.</description>
14+
</annotations>
15+
<waitForElementClickable selector="{{CurrencySetupSection.currencyOptions}}" stepKey="waitForCurrencyOptionsHeaderToBeClickable"/>
16+
<conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.CheckCurrencyOptionsIfTabExpand}}" stepKey="checkCurrencyTabOpen" visible="true"/>
17+
<conditionalClick selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" dependentSelector="{{CurrencySetupSection.baseCurrencyUseDefault}}" stepKey="checkBaseCurrencySystemValue" visible="true"/>
18+
<waitForElementClickable selector="{{CurrencySetupSection.defaultdisplayCurrency}}" stepKey="waitForDisplayCurrencySystemToBeClickable"/>
19+
<checkOption selector="{{CurrencySetupSection.defaultdisplayCurrency}}" stepKey="checkDisplayCurrencySystemValue"/>
20+
<waitForElementClickable selector="{{CurrencySetupSection.allowcurrenciescheckbox}}" stepKey="waitForAllowedCurrencySystemToBeClickable"/>
21+
<checkOption selector="{{CurrencySetupSection.allowcurrenciescheckbox}}" stepKey="checkAllowedCyCurrencySystemValue"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminConfigureCurrenciesActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="AdminConfigureCurrenciesActionGroup">
12+
<annotations>
13+
<description> Admin uncheck currency option system values.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="baseValue" type="string" defaultValue="Norwegian Krone"/>
17+
<argument name="defaultValue" type="string" defaultValue="British Pound"/>
18+
<argument name="allowedValue" type="string" defaultValue="['British Pound']"/>
19+
</arguments>
20+
<waitForElementVisible selector="{{AdminConfigSection.baseCurrency}}" stepKey="waitForBaseCurrencyToVisible"/>
21+
<selectOption selector="{{AdminConfigSection.baseCurrency}}" userInput="{{baseValue}}" stepKey="selectBaseCurrency"/>
22+
<waitForElementVisible selector="{{AdminConfigSection.defaultCurrency}}" stepKey="waitForDefaultCurrencyToVisible"/>
23+
<selectOption selector="{{AdminConfigSection.defaultCurrency}}" userInput="{{defaultValue}}" stepKey="selectDefaultDisplayCurrency"/>
24+
<waitForElementVisible selector="{{AdminConfigSection.allowedCurrencies}}" stepKey="waitForAllowedCurrencyToVisible"/>
25+
<selectOption selector="{{AdminConfigSection.allowedCurrencies}}" parameterArray="{{allowedValue}}" stepKey="selectAllowedDisplayCurrency"/>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminUnCheckCurrencyOptionsSystemValuesActionGroup.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="AdminUnCheckCurrencyOptionsSystemValuesActionGroup">
12+
<annotations>
13+
<description> Admin uncheck currency option system values.</description>
14+
</annotations>
15+
<waitForElementClickable selector="{{CurrencySetupSection.currencyOptions}}" stepKey="waitForCurrencyOptionsHeaderToBeClickable"/>
16+
<conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.CheckCurrencyOptionsIfTabExpand}}" stepKey="checkCurrencyTabOpen" visible="true"/>
17+
<waitForElementClickable selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" stepKey="waitForBaseCurrencySystemToBeClickable"/>
18+
<uncheckOption selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" stepKey="unCheckBaseCurrencySystemValue"/>
19+
<waitForElementClickable selector="{{CurrencySetupSection.defaultdisplayCurrency}}" stepKey="waitForDisplayCurrencySystemToBeClickable"/>
20+
<uncheckOption selector="{{CurrencySetupSection.defaultdisplayCurrency}}" stepKey="unCheckDisplayCurrencySystemValue"/>
21+
<waitForElementClickable selector="{{CurrencySetupSection.allowcurrenciescheckbox}}" stepKey="waitForAllowedCurrencySystemToBeClickable"/>
22+
<uncheckOption selector="{{CurrencySetupSection.allowcurrenciescheckbox}}" stepKey="unCheckAllowedCyCurrencySystemValue"/>
23+
</actionGroup>
24+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<element name="productTierPriceFixedPriceInput" type="input" selector="[name='product[tier_price][{{var1}}][price]']" parameterized="true"/>
2222
<element name="productTierPricePercentageValuePriceInput" type="input" selector="[name='product[tier_price][{{var1}}][percentage_value]']" parameterized="true"/>
2323
<element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
24+
<element name="cost" type="input" selector="//input[@name='product[cost]']"/>
2425
<element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="30"/>
2526
<element name="msrp" type="input" selector="//input[@name='product[msrp]']" timeout="30"/>
2627
<element name="msrpType" type="select" selector="//select[@name='product[msrp_display_actual_price_type]']" timeout="30"/>

‎app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
<element name="allowedCurrencies" type="multiselect" selector="#currency_options_allow" />
2828
<element name="defaultCurrencyCheckbox" type="checkbox" selector="#currency_options_default_inherit"/>
2929
<element name="allowedCurrencyCheckbox" type="checkbox" selector="#currency_options_allow_inherit"/>
30+
<element name="baseCurrency" type="button" selector="#currency_options_base"/>
3031
</section>
3132
</sections>

‎app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<element name="defaultCurrency" type="select" selector="#currency_options_default"/>
1717
<element name="defaultdisplayCurrency" type="select" selector="#currency_options_default_inherit"/>
1818
<element name="allowcurrenciescheckbox" type="select" selector="#currency_options_allow_inherit"/>
19+
<element name="CheckCurrencyOptionsIfTabExpand" type="button" selector="#currency_options-head:not(.open)"/>
1920
</section>
2021
</sections>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,14 @@
3737
<element name="FPT" type="text" selector="//tr[@class='weee_ord_totals']//td[@data-th='FPT']/span"/>
3838
<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']"/>
3939
<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']"/>
40+
<element name="productRate" type="text" selector="//table[contains(@class, 'data table table-order-items')]//td[normalize-space(.)='Product Rate CA (10%)']/following-sibling::td//span[@class='price']"/>
41+
<element name="shippingRate" type="text" selector="//table[contains(@class, 'data table table-order-items')]//td[normalize-space(.)='Shipping Rate CA (5%)']/following-sibling::td//span[@class='price']"/>
42+
<element name="subtotalExclTax" type="text" selector="//tr[@class='subtotal_excl']//td[@data-th='Subtotal (Excl.Tax)']/span"/>
43+
<element name="subtotalInclTax" type="text" selector="//tr[@class='subtotal_incl']//td[@data-th='Subtotal (Incl.Tax)']/span"/>
44+
<element name="shippingAndHandlingExclTax" type="text" selector="//tr[@class='shipping']//td[@data-th='Shipping &amp; Handling (Excl.Tax)']/span"/>
45+
<element name="shippingAndHandlingInclTax" type="text" selector="//tr[@class='shipping_incl']//td[@data-th='Shipping &amp; Handling (Incl.Tax)']/span"/>
46+
<element name="grandTotalExclTax" type="text" selector="//tr[@class='grand_total']//td[@data-th='Grand Total (Excl.Tax)']"/>
47+
<element name="grandTotalInclTax" type="text" selector="//tr[@class='grand_total_incl']//td[@data-th='Grand Total (Incl.Tax)']"/>
48+
<element name="grandTotalToBeCharged" type="text" selector=".base_grandtotal .price"/>
4049
</section>
4150
</sections>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertUsdAndEurOrderTotalsActionGroup.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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="AdminAssertUsdAndEurOrderTotalsActionGroup">
12+
<annotations>
13+
<description>Asserts Totals on the Order View page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="catalogExclTaxUsdValue" type="string" defaultValue="$99.99"/>
17+
<argument name="catalogExclTaxEurValue" type="string" defaultValue="€89.36"/>
18+
<argument name="catalogInclTaxUsdValue" type="string" defaultValue="$109.99"/>
19+
<argument name="catalogInclTaxEurValue" type="string" defaultValue="€98.30"/>
20+
<argument name="usdDiscountValue" type="string" defaultValue="$20.04"/>
21+
<argument name="eurDiscountValue" type="string" defaultValue="€17.91"/>
22+
<argument name="eurSubtotalInclTaxValue" type="string" defaultValue="€80.39"/>
23+
<argument name="usdSubtotalInclTaxValue" type="string" defaultValue="$89.95"/>
24+
<argument name="eurSubtotalExclTaxValue" type="string" defaultValue="€73.08"/>
25+
<argument name="usdSubtotalExclTaxValue" type="string" defaultValue="$81.77"/>
26+
</arguments>
27+
28+
<waitForElement selector="{{AdminOrderTotalSection.catalogTotalPriceExclTax('catalogExclTaxUsdValue')}}" stepKey="checkCatalogExclTaxUsdValue"/>
29+
<waitForElement selector="{{AdminOrderTotalSection.catalogTotalPriceExclTax('catalogExclTaxEurValue')}}" stepKey="checkCatalogExclTaxEurValue"/>
30+
<waitForElement selector="{{AdminOrderTotalSection.catalogTotalPriceInclTax('catalogInclTaxUsdValue')}}" stepKey="checkCatalogInclTaxUsdValue"/>
31+
<waitForElement selector="{{AdminOrderTotalSection.catalogTotalPriceInclTax('catalogInclTaxEurValue')}}" stepKey="checkCatalogInclTaxEurValue"/>
32+
<waitForElement selector="{{AdminOrderTotalSection.negotiatedDiscount('usdDiscountValue')}}" stepKey="checkNegotiatedDiscountUsdValue"/>
33+
<waitForElement selector="{{AdminOrderTotalSection.negotiatedDiscount('eurDiscountValue')}}" stepKey="checkNegotiatedDiscountEurValue"/>
34+
<waitForElement selector="{{AdminOrderTotalSection.subTotalInclTax('eurSubtotalInclTaxValue')}}" stepKey="checkSubtotalInclEurValue"/>
35+
<waitForElement selector="{{AdminOrderTotalSection.subTotalInclTax('usdSubtotalInclTaxValue')}}" stepKey="checkSubtotalInclUsdValue"/>
36+
<waitForElement selector="{{AdminOrderTotalSection.subTotalExclTax('eurSubtotalExclTaxValue')}}" stepKey="checkSubtotalExclEurValue"/>
37+
<waitForElement selector="{{AdminOrderTotalSection.subTotalExclTax('usdSubtotalExclTaxValue')}}" stepKey="checkSubtotalExclUsdValue"/>
38+
</actionGroup>
39+
</actionGroups>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,10 @@
2121
<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']"/>
2222
<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']"/>
2323
<element name="subTotal1" type="text" selector=".//*[@class='col-subtotal col-price']"/>
24+
<element name="catalogTotalPriceExclTax" type="text" selector="//tbody//tr[@class='col-catalog_price_excl_tax']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
25+
<element name="catalogTotalPriceInclTax" type="text" selector="//tbody//tr[@class='col-catalog_price_incl_tax']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
26+
<element name="negotiatedDiscount" type="text" selector="//tbody//tr[@class='col-negotiated_discount']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
27+
<element name="subTotalInclTax" type="text" selector="//tbody//tr[@class='col-subtotal_incl']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
28+
<element name="subTotalExclTax" type="text" selector="//tbody//tr[@class='col-subtotal_excl']//span[@class='price' and contains(text(),'{{value}}')]" parameterized="true"/>
2429
</section>
2530
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@
3636
<element name="selectProductPreviousPage" type="button" selector="//button[@class='action-previous']"/>
3737
<element name="displayedProducts" type="text" selector="//input[@class='checkbox admin__control-checkbox']/../../..//td[contains(@class,'col-sku') and contains(text(),'test')]"/>
3838
<element name="pageNumber" type="input" selector="//input[@id='sales_order_create_search_grid_page-current' and @value='{{page_index}}']" parameterized="true"/>
39+
<element name="grandTotal" type="text" selector="//div[@data-role='grid-wrapper']//tr//td[contains(.,'{{value}}')]" parameterized="true"/>
3940
</section>
4041
</sections>

0 commit comments

Comments
 (0)