Skip to content

Commit 4eea8d8

Browse files
MomotenkoNataliaMomotenkoNatalia
authored
Merge pull request #492 from magento-folks/MAGETWO-57562
Fixed issue: - MAGETWO-57562: Sales functional tests fail against ECE 2.0.9 (wrong grand total price)
2 parents 2362188 + a80c696 commit 4eea8d8

File tree

13 files changed

+313
-40
lines changed

13 files changed

+313
-40
lines changed

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc37",
3+
"magento/mtf": "2.0.x-dev",
44
"php": "~5.5.0|~5.6.0|~7.0.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2"

‎dev/tests/functional/etc/repository_replacer.xml

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2016 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
10+
11+
<repository class="Magento\Catalog\Test\Repository\CatalogAttributeSet">
12+
<dataset name="default">
13+
<field name="attribute_set_id" xsi:type="number">4</field>
14+
</dataset>
15+
</repository>
16+
17+
<repository class="Magento\Catalog\Test\Repository\CatalogProductAttribute">
18+
<dataset name="quantity_and_stock_status">
19+
<field name="attribute_id" xsi:type="number">113</field>
20+
</dataset>
21+
22+
<dataset name="tax_class_id">
23+
<field name="attribute_id" xsi:type="number">172</field>
24+
</dataset>
25+
</repository>
26+
27+
<repository class="Magento\Catalog\Test\Repository\Category">
28+
<dataset name="default_category">
29+
<field name="parent_id" xsi:type="number">1</field>
30+
<field name="id" xsi:type="number">2</field>
31+
</dataset>
32+
33+
<dataset name="root_category">
34+
<field name="parent_id" xsi:type="number">1</field>
35+
</dataset>
36+
</repository>
37+
38+
<repository class="Magento\Customer\Test\Repository\CustomerGroup">
39+
<dataset name="General">
40+
<field name="customer_group_id" xsi:type="number">1</field>
41+
</dataset>
42+
43+
<dataset name="Retailer">
44+
<field name="customer_group_id" xsi:type="number">3</field>
45+
</dataset>
46+
47+
<dataset name="Wholesale">
48+
<field name="customer_group_id" xsi:type="number">2</field>
49+
</dataset>
50+
51+
<dataset name="all_customer_groups">
52+
<field name="customer_group_id" xsi:type="number">0</field>
53+
</dataset>
54+
55+
<dataset name="NOT_LOGGED_IN">
56+
<field name="customer_group_id" xsi:type="number">0</field>
57+
</dataset>
58+
59+
<dataset name="ALL_GROUPS">
60+
<field name="customer_group_id" xsi:type="number">32000</field>
61+
</dataset>
62+
</repository>
63+
64+
<repository class="Magento\Store\Test\Repository\Store">
65+
<dataset name="default">
66+
<field name="store_id" xsi:type="number">1</field>
67+
</dataset>
68+
69+
<dataset name="default_store_view">
70+
<field name="store_id" xsi:type="number">1</field>
71+
</dataset>
72+
73+
<dataset name="all_store_views">
74+
<field name="store_id" xsi:type="number">0</field>
75+
</dataset>
76+
</repository>
77+
78+
<repository class="Magento\Store\Test\Repository\StoreGroup">
79+
<dataset name="default">
80+
<field name="group_id" xsi:type="number">1</field>
81+
</dataset>
82+
</repository>
83+
84+
<repository class="Magento\Store\Test\Repository\Website">
85+
<dataset name="default">
86+
<field name="website_id" xsi:type="number">1</field>
87+
</dataset>
88+
89+
<dataset name="all_websites">
90+
<field name="website_id" xsi:type="number">0</field>
91+
</dataset>
92+
93+
<dataset name="main_website">
94+
<field name="website_id" xsi:type="number">1</field>
95+
</dataset>
96+
</repository>
97+
98+
<repository class="Magento\Tax\Test\Repository\TaxClass">
99+
<dataset name="taxable_goods">
100+
<field name="id" xsi:type="number">2</field>
101+
<field name="class_id" xsi:type="number">2</field>
102+
</dataset>
103+
104+
<dataset name="retail_customer">
105+
<field name="class_id" xsi:type="number">3</field>
106+
<field name="id" xsi:type="number">3</field>
107+
</dataset>
108+
109+
<dataset name="None">
110+
<field name="id" xsi:type="number">0</field>
111+
</dataset>
112+
</repository>
113+
114+
<repository class="Magento\Tax\Test\Repository\TaxRate">
115+
<dataset name="US-CA-Rate_1">
116+
<field name="tax_calculation_rate_id" xsi:type="number">1</field>
117+
<field name="tax_region_id" xsi:type="number">12</field>
118+
</dataset>
119+
120+
<dataset name="US-IL-Rate_1">
121+
<field name="tax_region_id" xsi:type="number">23</field>
122+
</dataset>
123+
124+
<dataset name="US-NY-Rate_1">
125+
<field name="tax_calculation_rate_id" xsi:type="number">2</field>
126+
<field name="tax_region_id" xsi:type="number">43</field>
127+
</dataset>
128+
129+
<dataset name="us_ca_rate_8_25_no_zip">
130+
<field name="tax_region_id" xsi:type="number">12</field>
131+
</dataset>
132+
133+
<dataset name="us_ny_rate_8_1">
134+
<field name="tax_region_id" xsi:type="number">43</field>
135+
</dataset>
136+
137+
<dataset name="us_ca_rate_8_25">
138+
<field name="tax_region_id" xsi:type="number">12</field>
139+
</dataset>
140+
141+
<dataset name="us_ca_rate_8_375">
142+
<field name="tax_region_id" xsi:type="number">12</field>
143+
</dataset>
144+
145+
<dataset name="us_ny_rate_8_375">
146+
<field name="tax_region_id" xsi:type="number">43</field>
147+
</dataset>
148+
149+
<dataset name="us_ny_rate_8_25">
150+
<field name="tax_region_id" xsi:type="number">43</field>
151+
</dataset>
152+
153+
<dataset name="paypal_rate_8_25">
154+
<field name="tax_region_id" xsi:type="number">12</field>
155+
</dataset>
156+
157+
<dataset name="withZipRange">
158+
<field name="tax_region_id" xsi:type="number">12</field>
159+
</dataset>
160+
161+
<dataset name="withFixedZip">
162+
<field name="tax_region_id" xsi:type="number">57</field>
163+
</dataset>
164+
165+
<dataset name="us_ut_fixed_zip_rate_20">
166+
<field name="tax_region_id" xsi:type="number">58</field>
167+
</dataset>
168+
169+
<dataset name="tx_rate_10">
170+
<field name="tax_region_id" xsi:type="number">57</field>
171+
</dataset>
172+
173+
<dataset name="ny_rate_20">
174+
<field name="tax_region_id" xsi:type="number">43</field>
175+
</dataset>
176+
177+
<dataset name="ca_rate_30">
178+
<field name="tax_region_id" xsi:type="number">12</field>
179+
</dataset>
180+
181+
</repository>
182+
183+
<repository class="Magento\User\Test\Repository\Role">
184+
<dataset name="Administrators">
185+
<field name="role_id" xsi:type="number">1</field>
186+
</dataset>
187+
</repository>
188+
189+
<repository class="Magento\User\Test\Repository\User">
190+
<dataset name="default">
191+
<field name="user_id" xsi:type="number">1</field>
192+
</dataset>
193+
</repository>
194+
195+
<repository class="Magento\Catalog\Test\Repository\CatalogProductSimple">
196+
<dataset name="sample_data_simple_product">
197+
<field name="id" xsi:type="number">1</field>
198+
</dataset>
199+
</repository>
200+
</config>

‎dev/tests/functional/lib/Magento/Mtf/Util/ModuleResolver/SequenceSorter.php

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Mtf\Util\ModuleResolver;
7+
8+
/**
9+
* Module sequence sorter.
10+
*/
11+
class SequenceSorter implements SequenceSorterInterface
12+
{
13+
/**
14+
* Magento ObjectManager.
15+
*
16+
* @var \Magento\Framework\ObjectManagerInterface
17+
*/
18+
protected $magentoObjectManager;
19+
/**
20+
* @constructor
21+
*/
22+
public function __construct()
23+
{
24+
$this->initObjectManager();
25+
}
26+
/**
27+
* Initialize Magento ObjectManager.
28+
*
29+
* @return void
30+
*/
31+
protected function initObjectManager()
32+
{
33+
if (!$this->magentoObjectManager) {
34+
$objectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(
35+
BP,
36+
$_SERVER
37+
);
38+
$this->magentoObjectManager = $objectManagerFactory->create($_SERVER);
39+
}
40+
}
41+
/**
42+
* Get Magento module sequence load.
43+
*
44+
* @return array
45+
*/
46+
protected function getModuleSequence()
47+
{
48+
return $this->magentoObjectManager->create(\Magento\Framework\Module\ModuleList\Loader::class)->load();
49+
}
50+
/**
51+
* Sort files according to specified sequence.
52+
*
53+
* @param array $paths
54+
* @return array
55+
*/
56+
public function sort(array $paths)
57+
{
58+
$sortedPaths = [];
59+
$modules = array_keys($this->getModuleSequence());
60+
foreach ($modules as $module) {
61+
foreach ($paths as $key => $path) {
62+
$modulePath = realpath(MTF_TESTS_PATH . str_replace('_', DIRECTORY_SEPARATOR, $module));
63+
$path = realpath($path);
64+
if (strpos($path, $modulePath) !== false) {
65+
$sortedPaths[] = $path;
66+
unset($paths[$key]);
67+
}
68+
}
69+
}
70+
$sortedPaths = array_merge($sortedPaths, $paths);
71+
return $sortedPaths;
72+
}
73+
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogAttributeSet.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
99
<repository class="Magento\Catalog\Test\Repository\CatalogAttributeSet">
1010
<dataset name="default">
11+
<field name="attribute_set_id" xsi:type="string">%id%</field>
1112
<field name="attribute_set_name" xsi:type="string">Default</field>
12-
<field name="attribute_set_id" xsi:type="string">4</field>
1313
</dataset>
1414

1515
<dataset name="custom_attribute_set">

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductAttribute.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</dataset>
1515

1616
<dataset name="quantity_and_stock_status">
17-
<field name="attribute_id" xsi:type="number">113</field>
17+
<field name="attribute_id" xsi:type="string">%id%</field>
1818
<field name="frontend_label" xsi:type="string">Quantity</field>
1919
<field name="attribute_code" xsi:type="string">quantity_and_stock_status</field>
2020
<field name="frontend_input" xsi:type="string">Dropdown</field>
@@ -34,7 +34,7 @@
3434
</dataset>
3535

3636
<dataset name="tax_class_id">
37-
<field name="attribute_id" xsi:type="number">172</field>
37+
<field name="attribute_id" xsi:type="string">%id%</field>
3838
<field name="frontend_label" xsi:type="string">Tax Class</field>
3939
<field name="attribute_code" xsi:type="string">tax_class_id</field>
4040
<field name="frontend_input" xsi:type="string">Dropdown</field>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
</dataset>
1919

2020
<dataset name="default_category">
21+
<field name="id" xsi:type="string">%id%</field>
22+
<field name="parent_id" xsi:type="string">%id%</field>
2123
<field name="name" xsi:type="string">Default Category</field>
22-
<field name="parent_id" xsi:type="string">1</field>
2324
<field name="is_active" xsi:type="string">Yes</field>
24-
<field name="id" xsi:type="string">2</field>
2525
</dataset>
2626

2727
<dataset name="default_subcategory">
@@ -46,8 +46,8 @@
4646
</dataset>
4747

4848
<dataset name="root_category">
49+
<field name="parent_id" xsi:type="string">%id%</field>
4950
<field name="name" xsi:type="string">RootCategory%isolation%</field>
50-
<field name="parent_id" xsi:type="string">1</field>
5151
<field name="is_active" xsi:type="string">Yes</field>
5252
<field name="include_in_menu" xsi:type="string">Yes</field>
5353
</dataset>

‎dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerGroup.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,36 @@
1515
</dataset>
1616

1717
<dataset name="General">
18-
<field name="customer_group_id" xsi:type="string">1</field>
18+
<field name="customer_group_id" xsi:type="string">%id%</field>
1919
<field name="customer_group_code" xsi:type="string">General</field>
2020
<field name="tax_class_id" xsi:type="array">
2121
<item name="dataset" xsi:type="string">retail_customer</item>
2222
</field>
2323
</dataset>
2424

2525
<dataset name="Retailer">
26-
<field name="customer_group_id" xsi:type="string">3</field>
26+
<field name="customer_group_id" xsi:type="string">%id%</field>
2727
<field name="customer_group_code" xsi:type="string">Retailer</field>
2828
<field name="tax_class_id" xsi:type="array">
2929
<item name="dataset" xsi:type="string">retail_customer</item>
3030
</field>
3131
</dataset>
3232

3333
<dataset name="Wholesale">
34-
<field name="customer_group_id" xsi:type="string">2</field>
34+
<field name="customer_group_id" xsi:type="string">%id%</field>
3535
<field name="customer_group_code" xsi:type="string">Wholesale</field>
3636
<field name="tax_class_id" xsi:type="array">
3737
<item name="dataset" xsi:type="string">retail_customer</item>
3838
</field>
3939
</dataset>
4040

4141
<dataset name="all_customer_groups">
42-
<field name="customer_group_id" xsi:type="string">0</field>
42+
<field name="customer_group_id" xsi:type="string">%id%</field>
4343
<field name="customer_group_code" xsi:type="string">All Customer Groups</field>
4444
</dataset>
4545

4646
<dataset name="NOT_LOGGED_IN">
47-
<field name="customer_group_id" xsi:type="string">0</field>
47+
<field name="customer_group_id" xsi:type="string">%id%</field>
4848
<field name="customer_group_code" xsi:type="string">NOT LOGGED IN</field>
4949
<field name="tax_class_id" xsi:type="array">
5050
<item name="dataset" xsi:type="string">retail_customer</item>

‎dev/tests/functional/tests/app/Magento/Store/Test/Repository/StoreGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
99
<repository class="Magento\Store\Test\Repository\StoreGroup">
1010
<dataset name="default">
11+
<field name="group_id" xsi:type="string">%id%</field>
1112
<field name="website_id" xsi:type="array">
1213
<item name="dataset" xsi:type="string">main_website</item>
1314
</field>
1415
<field name="name" xsi:type="string">Main Website Store</field>
15-
<field name="group_id" xsi:type="string">1</field>
1616
<field name="root_category_id" xsi:type="array">
1717
<item name="dataset" xsi:type="string">default_category</item>
1818
</field>

0 commit comments

Comments
 (0)