Skip to content

Commit 661cd36

Browse files
SiarheiAndreyeuSiarheiAndreyeu
committed
MTO-127: [Test] Import Advanced Pricing
- Stabilization
1 parent 8ed318c commit 661cd36

23 files changed

+146
-202
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,6 @@
110110
</arguments>
111111
</virtualType>
112112

113-
<virtualType name="Magento\Mtf\Util\Command\File\Export\AdvancedPricingReader" type="Magento\Mtf\Util\Command\File\Export\Reader">
114-
<arguments>
115-
<argument name="template" xsi:type="string">advanced_pricing.*?\.csv</argument>
116-
</arguments>
117-
</virtualType>
118-
119113
<virtualType name="Magento\Mtf\Util\Command\File\Export\CustomerReader" type="Magento\Mtf\Util\Command\File\Export\Reader">
120114
<arguments>
121115
<argument name="template" xsi:type="string">customer.*?\.csv</argument>

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Constraint/AssertImportAdvancedPricing.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Mtf\Constraint\AbstractConstraint;
1010
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
1111
use Magento\ImportExport\Test\Fixture\ImportData;
12-
use Magento\Mtf\Fixture\FixtureFactory;
1312

1413
/**
1514
* Check imported advanced prices are correct.
@@ -37,13 +36,6 @@ class AssertImportAdvancedPricing extends AbstractConstraint
3736
*/
3837
private $catalogProductEdit;
3938

40-
/**
41-
* Fixture factory.
42-
*
43-
* @var FixtureFactory
44-
*/
45-
private $fixtureFactory;
46-
4739
/**
4840
* Import fixture.
4941
*
@@ -55,17 +47,14 @@ class AssertImportAdvancedPricing extends AbstractConstraint
5547
* Assert imported advanced prices are correct.
5648
*
5749
* @param CatalogProductEdit $catalogProductEdit
58-
* @param FixtureFactory $fixtureFactory
5950
* @param ImportData $import
6051
* @return void
6152
*/
6253
public function processAssert(
6354
CatalogProductEdit $catalogProductEdit,
64-
FixtureFactory $fixtureFactory,
6555
ImportData $import
6656
) {
6757
$this->catalogProductEdit = $catalogProductEdit;
68-
$this->fixtureFactory = $fixtureFactory;
6958
$this->import = $import;
7059

7160
$resultArrays = $this->getPreparePrices();
@@ -93,7 +82,6 @@ private function getPreparePrices()
9382
$advancedPricing = $this->catalogProductEdit->getProductForm()->openSection('advanced-pricing')
9483
->getSection('advanced-pricing');
9584
$tierPrices = $advancedPricing->getTierPriceForm()->getFieldsData();
96-
9785
$productSku = $product->getSku();
9886
foreach ($tierPrices as $tierPrice) {
9987
$resultProductArray[$productSku][] = $tierPrice;

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/Repository/ExportData.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
9+
<repository class="Magento\ImportExport\Test\Repository\ExportData">
10+
<dataset name="csv_with_advanced_pricing">
11+
<field name="entity" xsi:type="string">Advanced Pricing</field>
12+
<field name="file_format" xsi:type="string">CSV</field>
13+
</dataset>
14+
</repository>
15+
</config>

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
use Magento\ImportExport\Test\Page\Adminhtml\AdminExportIndex;
99
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
10-
use Magento\ImportExport\Test\Fixture\ExportData;
1110
use Magento\Mtf\TestStep\TestStepFactory;
1211
use Magento\Mtf\Fixture\FixtureFactory;
1312
use Magento\Store\Test\Fixture\Website;
@@ -75,7 +74,7 @@ public function __prepare(
7574
CatalogProductIndex $catalogProductIndex
7675
) {
7776
$catalogProductIndex->open();
78-
$catalogProductIndex->getProductGrid()->removeAllProducts();
77+
$catalogProductIndex->getProductGrid()->massaction([], 'Delete', true, 'Select All');
7978
}
8079

8180
/**
@@ -100,7 +99,7 @@ public function __inject(
10099
}
101100

102101
/**
103-
* Runs Export Advance Pricing test.
102+
* Runs Export Advanced Pricing test.
104103
*
105104
* @param string $exportData
106105
* @param array $products
@@ -201,7 +200,7 @@ private function setupCurrencyForCustomWebsite($website, $currency)
201200
public function prepareProducts(array $products, Website $website = null)
202201
{
203202
if (empty($products)) {
204-
return;
203+
return null;
205204
}
206205
$createdProducts = [];
207206
foreach ($products as $product) {

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<testCase name="Magento\AdvancedPricingImportExport\Test\TestCase\ExportAdvancedPricingTest" summary="Export with advanced pricing entity type option">
1010
<variation name="ExportAdvancedPricingTestVariation1" summary="Trying export product data with advanced pricing option but without created products" ticketId="MAGETWO-46147">
1111
<data name="exportData" xsi:type="string">csv_with_advanced_pricing</data>
12-
<constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricingNoDataErrorMessage"/>
12+
<constraint name="Magento\ImportExport\Test\Constraint\AssertExportNoDataErrorMessage"/>
1313
</variation>
1414
<variation name="ExportAdvancedPricingTestVariation2" summary="Trying export product data with advanced pricing option" ticketId="MAGETWO-46120">
1515
<data name="exportData" xsi:type="string">csv_with_advanced_pricing</data>

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
<variation name="ImportProductsVariation4" ticketId="MAGETWO-46159" summary="Replace product tier prices in two websites">
7777
<data name="issue" xsi:type="string">MAGETWO-66134: [Export/Import] Advanced Pricing import works incorrect</data>
7878
<data name="changeCurrency" xsi:type="boolean">true</data>
79+
<data name="configData" xsi:type="string">price_scope_website</data>
80+
<data name="rollback" xsi:type="boolean">true</data>
7981
<data name="import/data" xsi:type="array">
8082
<item name="entity" xsi:type="string">Advanced Pricing</item>
8183
<item name="behavior" xsi:type="string">Replace</item>
@@ -94,7 +96,7 @@
9496
</item>
9597
</item>
9698
</data>
97-
<constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportSuccessMessage" />
99+
<constraint name="Magento\ImportExport\Test\Constraint\AssertImportSuccessMessage" />
98100
<constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportAdvancedPricing" />
99101
</variation>
100102
</testCase>

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_incorrect.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@
55
*/
66

77
return [
8-
'entity_0' =>
9-
[
10-
'data_0' =>
11-
[
12-
'sku' => '%sku%',
13-
'tier_price_website' => "All Websites [USD]",
14-
'tier_price_customer_group' => 'ALL GROUPS',
15-
'tier_price_qty' => '3',
16-
'tier_price' => 'text',
17-
'tier_price_value_type' => 'Fixed',
18-
],
8+
'entity_0' => [
9+
'data_0' => [
10+
'sku' => '%sku%',
11+
'tier_price_website' => "All Websites [USD]",
12+
'tier_price_customer_group' => 'ALL GROUPS',
13+
'tier_price_qty' => '3',
14+
'tier_price' => 'text',
15+
'tier_price_value_type' => 'Fixed',
1916
],
17+
],
2018
];

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_price_variation_1.php

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,22 @@
55
*/
66

77
return [
8-
'entity_0' =>
9-
[
10-
'data_0' =>
11-
[
12-
'sku' => '%sku%',
13-
'tier_price_website' => "All Websites [USD]",
14-
'tier_price_customer_group' => 'General',
15-
'tier_price_qty' => '10',
16-
'tier_price' => '8.00',
17-
'tier_price_value_type' => 'Fixed',
18-
],
19-
'data_1' =>
20-
[
21-
'sku' => '%sku%',
22-
'tier_price_website' => "All Websites [USD]",
23-
'tier_price_customer_group' => "NOT LOGGED IN",
24-
'tier_price_qty' => '10',
25-
'tier_price' => '9.00',
26-
'tier_price_value_type' => 'Fixed',
27-
]
8+
'entity_0' => [
9+
'data_0' => [
10+
'sku' => '%sku%',
11+
'tier_price_website' => "All Websites [USD]",
12+
'tier_price_customer_group' => 'General',
13+
'tier_price_qty' => '10',
14+
'tier_price' => '8.00',
15+
'tier_price_value_type' => 'Fixed',
2816
],
17+
'data_1' => [
18+
'sku' => '%sku%',
19+
'tier_price_website' => "All Websites [USD]",
20+
'tier_price_customer_group' => "NOT LOGGED IN",
21+
'tier_price_qty' => '10',
22+
'tier_price' => '9.00',
23+
'tier_price_value_type' => 'Fixed',
24+
]
25+
],
2926
];

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_price_variation_2.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@
55
*/
66

77
return [
8-
'entity_0' =>
9-
[
10-
'data_0' =>
11-
[
12-
'sku' => '%sku%',
13-
'tier_price_website' => "All Websites [USD]",
14-
'tier_price_customer_group' => 'ALL GROUPS',
15-
'tier_price_qty' => '10',
16-
'tier_price' => '8.00',
17-
'tier_price_value_type' => 'Fixed',
18-
],
8+
'entity_0' => [
9+
'data_0' => [
10+
'sku' => '%sku%',
11+
'tier_price_website' => "All Websites [USD]",
12+
'tier_price_customer_group' => 'ALL GROUPS',
13+
'tier_price_qty' => '10',
14+
'tier_price' => '8.00',
15+
'tier_price_value_type' => 'Fixed',
1916
],
17+
],
2018
];

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/_files/template/pricing/advanced_price_variation_3.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@
55
*/
66

77
return [
8-
'entity_0' =>
9-
[
10-
'data_0' =>
11-
[
12-
'sku' => '%sku%',
13-
'tier_price_website' => "All Websites [USD]",
14-
'tier_price_customer_group' => 'ALL GROUPS',
15-
'tier_price_qty' => '95',
16-
'tier_price' => '5.00',
17-
'tier_price_value_type' => 'Fixed',
18-
],
8+
'entity_0' => [
9+
'data_0' => [
10+
'sku' => '%sku%',
11+
'tier_price_website' => "All Websites [USD]",
12+
'tier_price_customer_group' => 'ALL GROUPS',
13+
'tier_price_qty' => '95',
14+
'tier_price' => '5.00',
15+
'tier_price_value_type' => 'Fixed',
1916
],
17+
],
2018
];

0 commit comments

Comments
 (0)