Skip to content

Commit ad21e1b

Browse files
glo60612glo60612
committed
Merge remote-tracking branch 'origin/2.4-develop' into AC-7918
2 parents b12ab97 + 1b2e87c commit ad21e1b

25 files changed

+600
-7
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/ActionGroup/AdminSetTaxClassForShippingActionGroup.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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSetTaxClassForShippingActionGroup" extends="SetTaxClassForShippingActionGroup">
12+
<annotations>
13+
<description>Extends to select required shipping tax class</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="taxClass" type="string" defaultValue="Taxable Goods"/>
17+
</arguments>
18+
19+
<remove keyForRemoval="selectOption"/>
20+
<selectOption selector="{{SalesConfigSection.ShippingTaxClass}}" userInput="{{taxClass}}" after="uncheckUseSystemValue" stepKey="setShippingTaxClass"/>
21+
</actionGroup>
22+
</actionGroups>

‎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/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<severity value="CRITICAL"/>
1919
<testCaseId value="MC-25681"/>
2020
<group value="SearchEngine"/>
21-
<skip>
22-
<issueId value="ACQE-4352"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<magentoCLI command="config:set checkout/options/enable_guest_checkout_login 1" stepKey="EnablingGuestCheckoutLogin"/>

‎app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<testCaseId value="AC-6031" />
1919
<useCaseId value="ACP2E-1012"/>
2020
<group value="currency"/>
21-
<skip>
22-
<issueId value="ACQE-4266"/>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

0 commit comments

Comments
 (0)