Skip to content

Commit 0c41aea

Browse files
Lusine-PapyanYauhen_Lyskavets
Lusine-Papyan
authored and
Yauhen_Lyskavets
committed
MAGETWO-67450: The rate in order is duplicated
- Updated automated test script
1 parent 72183b7 commit 0c41aea

File tree

4 files changed

+66
-17
lines changed

4 files changed

+66
-17
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceConfigData.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="CatalogPriceScopeConfigData">
12+
<data key="path">catalog/price/scope</data>
13+
<data key="value_website">1</data>
14+
<data key="value_global">0</data>
15+
</entity>
16+
</entities>

‎app/code/Magento/CurrencySymbol/Test/Mftf/Data/CurrencyRatesConfigData.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="SetCurrencyBaseConfig">
12+
<data key="path">currency/options/base</data>
13+
<data key="value_usd">USD</data>
14+
<data key="value_eur">EUR</data>
15+
<data key="scope">websites</data>
16+
<data key="scope_code">base</data>
17+
</entity>
18+
<entity name="SetAllowedCurrenciesConfig">
19+
<data key="path">currency/options/allow</data>
20+
<data key="value_three_currencies">EUR,USD,RUB</data>
21+
<data key="value_two_currencies">EUR,USD</data>
22+
<data key="value_usd">USD</data>
23+
<data key="scope">websites</data>
24+
<data key="scope_code">base</data>
25+
</entity>
26+
<entity name="SetDefaultCurrencyConfig">
27+
<data key="path">currency/options/default</data>
28+
<data key="value_eur">EUR</data>
29+
<data key="value_usd">USD</data>
30+
<data key="scope">websites</data>
31+
<data key="scope_code">base</data>
32+
</entity>
33+
</entities>

‎app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<!--Create product-->
2525
<createData entity="SimpleProduct2" stepKey="createNewProduct"/>
2626
<!--Set Currency options for Website-->
27-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/base USD" stepKey="setCurrencyBaseUSDWebsites"/>
28-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/allow EUR,USD,RUB" stepKey="setAllowedCurrencyWebsites"/>
29-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/default EUR" stepKey="setCurrencyDefaultUSDWebsites"/>
27+
<magentoCLI command="config:set --scope={{SetCurrencyBaseConfig.scope}} --scope-code={{SetCurrencyBaseConfig.scope_code}} {{SetCurrencyBaseConfig.path}} {{SetCurrencyBaseConfig.value_usd}}" stepKey="setCurrencyBaseUSDWebsites"/>
28+
<magentoCLI command="config:set --scope={{SetAllowedCurrenciesConfig.scope}} --scope-code={{SetAllowedCurrenciesConfig.scope_code}} {{SetAllowedCurrenciesConfig.path}} {{SetAllowedCurrenciesConfig.value_three_currencies}}" stepKey="setAllowedCurrencyWebsites"/>
29+
<magentoCLI command="config:set --scope={{SetDefaultCurrencyConfig.scope}} --scope-code={{SetDefaultCurrencyConfig.scope_code}} {{SetDefaultCurrencyConfig.path}} {{SetDefaultCurrencyConfig.value_eur}}" stepKey="setCurrencyDefaultEURWebsites"/>
3030
</before>
3131
<after>
3232
<!--Delete created product-->

‎app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayedInOneLineTest.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@
2424
<!--Create product-->
2525
<createData entity="SimpleProduct2" stepKey="createProduct"/>
2626
<!--Set price scope website-->
27-
<magentoCLI command="config:set catalog/price/scope 1" stepKey="setCatalogPriceScopeWebsite"/>
27+
<magentoCLI command="config:set {{CatalogPriceScopeConfigData.path}} {{CatalogPriceScopeConfigData.value_website}}" stepKey="setCatalogPriceScopeWebsite"/>
2828
<!--Set Currency options for Default Config-->
29-
<magentoCLI command="config:set currency/options/base EUR" stepKey="setCurrencyBaseEUR"/>
30-
<magentoCLI command="config:set currency/options/allow EUR,USD" stepKey="setAllowedCurrencyEUR"/>
31-
<magentoCLI command="config:set currency/options/default EUR" stepKey="setCurrencyDefaultEUR"/>
29+
<magentoCLI command="config:set {{SetCurrencyBaseConfig.path}} {{SetCurrencyBaseConfig.value_eur}}" stepKey="setCurrencyBaseEUR"/>
30+
<magentoCLI command="config:set {{SetAllowedCurrenciesConfig.path}} {{SetAllowedCurrenciesConfig.value_two_currencies}}" stepKey="setAllowedCurrencyEUR"/>
31+
<magentoCLI command="config:set {{SetDefaultCurrencyConfig.path}} {{SetDefaultCurrencyConfig.value_eur}}" stepKey="setCurrencyDefaultEUR"/>
3232
<!--Set Currency options for Website-->
33-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/base USD" stepKey="setCurrencyBaseEURWebsites"/>
34-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/allow EUR,USD" stepKey="setAllowedCurrencyEURWebsites"/>
35-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/default EUR" stepKey="setCurrencyDefaultEURWebsites"/>
33+
<magentoCLI command="config:set --scope={{SetCurrencyBaseConfig.scope}} --scope-code={{SetCurrencyBaseConfig.scope_code}} {{SetCurrencyBaseConfig.path}} {{SetCurrencyBaseConfig.value_usd}}" stepKey="setCurrencyBaseEURWebsites"/>
34+
<magentoCLI command="config:set --scope={{SetAllowedCurrenciesConfig.scope}} --scope-code={{SetAllowedCurrenciesConfig.scope_code}} {{SetAllowedCurrenciesConfig.path}} {{SetAllowedCurrenciesConfig.value_two_currencies}}" stepKey="setAllowedCurrencyWebsites"/>
35+
<magentoCLI command="config:set --scope={{SetDefaultCurrencyConfig.scope}} --scope-code={{SetDefaultCurrencyConfig.scope_code}} {{SetDefaultCurrencyConfig.path}} {{SetDefaultCurrencyConfig.value_eur}}" stepKey="setCurrencyDefaultEURWebsites"/>
3636
</before>
3737
<after>
3838
<!--Delete created product-->
3939
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
4040
<!--Reset configurations-->
41-
<magentoCLI command="config:set catalog/price/scope 0" stepKey="setCatalogPriceScopeGlobal"/>
42-
<magentoCLI command="config:set currency/options/base USD" stepKey="setCurrencyBaseUSD"/>
43-
<magentoCLI command="config:set currency/options/default USD" stepKey="setCurrencyDefaultUSD"/>
44-
<magentoCLI command="config:set currency/options/allow USD" stepKey="setAllowedCurrencyUSD"/>
41+
<magentoCLI command="config:set {{CatalogPriceScopeConfigData.path}} {{CatalogPriceScopeConfigData.value_global}}" stepKey="setCatalogPriceScopeGlobal"/>
42+
<magentoCLI command="config:set {{SetCurrencyBaseConfig.path}} {{SetCurrencyBaseConfig.value_usd}}" stepKey="setCurrencyBaseUSD"/>
43+
<magentoCLI command="config:set {{SetDefaultCurrencyConfig.path}} {{SetDefaultCurrencyConfig.value_usd}}" stepKey="setCurrencyDefaultUSD"/>
44+
<magentoCLI command="config:set {{SetAllowedCurrenciesConfig.path}} {{SetAllowedCurrenciesConfig.value_usd}}" stepKey="setAllowedCurrencyUSD"/>
4545
<!--Set Currency options for Website-->
46-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/base USD" stepKey="setCurrencyBaseUSDWebsites"/>
47-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/default USD" stepKey="setCurrencyDefaultUSDWebsites"/>
48-
<magentoCLI command="config:set --scope=websites --scope-code=base currency/options/allow USD" stepKey="setAllowedCurrencyUSDWebsites"/>
46+
<magentoCLI command="config:set --scope={{SetCurrencyBaseConfig.scope}} --scope-code={{SetCurrencyBaseConfig.scope_code}} {{SetCurrencyBaseConfig.path}} {{SetCurrencyBaseConfig.value_usd}}" stepKey="setCurrencyBaseUSDWebsites"/>
47+
<magentoCLI command="config:set --scope={{SetDefaultCurrencyConfig.scope}} --scope-code={{SetDefaultCurrencyConfig.scope_code}} {{SetDefaultCurrencyConfig.path}} {{SetDefaultCurrencyConfig.value_usd}}" stepKey="setCurrencyDefaultUSDWebsites"/>
48+
<magentoCLI command="config:set --scope={{SetAllowedCurrenciesConfig.scope}} --scope-code={{SetAllowedCurrenciesConfig.scope_code}} {{SetAllowedCurrenciesConfig.path}} {{SetAllowedCurrenciesConfig.value_usd}}" stepKey="setAllowedCurrencyUSDWebsites"/>
4949
<actionGroup ref="logout" stepKey="logout"/>
5050
</after>
5151
<!--Open created product on Storefront and place for order-->

0 commit comments

Comments
 (0)