Skip to content

Commit 678a918

Browse files
MTO-128: [Test] Export Products
- Stabilization.
1 parent 4852730 commit 678a918

File tree

4 files changed

+5
-18
lines changed

4 files changed

+5
-18
lines changed

dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertExportProductDate.php

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

88
use Magento\Mtf\Constraint\AbstractConstraint;
99
use Magento\Mtf\Util\Command\File\ExportInterface;
10-
use \DateTime;
1110

1211
/**
1312
* Assert that date fields in exported file are shown in global configuration time zone.
@@ -18,10 +17,10 @@ class AssertExportProductDate extends AbstractConstraint
1817
* Assert that date fields in exported file are shown in global configuration time zone.
1918
*
2019
* @param ExportInterface $export
21-
* @param DateTime $dateTime
20+
* @param \DateTime $dateTime
2221
* @return void
2322
*/
24-
public function processAssert(ExportInterface $export, DateTime $dateTime)
23+
public function processAssert(ExportInterface $export, \DateTime $dateTime)
2524
{
2625
$exportData = $export->getLatest();
2726

dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportProduct.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class AssertImportProduct extends AbstractConstraint
4646
private $import;
4747

4848
/**
49-
* Edit page on backend
49+
* Edit page in Admin.
5050
*
5151
* @var CatalogProductEdit
5252
*/
@@ -145,16 +145,7 @@ private function getResultCsv($productSku)
145145
*/
146146
protected function getResultProductsData(array $productsData)
147147
{
148-
$resultProductsData = [];
149-
array_walk_recursive(
150-
$productsData,
151-
function ($value, $key) use (&$resultProductsData) {
152-
if (array_search($key, $this->neededKeys)) {
153-
$resultProductsData[$key] = $value;
154-
}
155-
}
156-
);
157-
return $resultProductsData;
148+
return array_intersect_key($productsData, array_flip($this->neededKeys));
158149
}
159150

160151
/**

dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertImportProduct" />
3434
<constraint name="Magento\CatalogImportExport\Test\Constraint\AssertEntitiesInGrid" />
3535
</variation>
36-
<variation name="ImportProductVariation2" ticketId="MAGETWO-47719" summary="Import Products with Replace Behavior">
36+
<variation name="ImportProductVariation2" ticketId="MAGETWO-47719" summary="Import Products assigned to different websites with Replace Behavior">
3737
<data name="import/data/entity" xsi:type="string">Products</data>
3838
<data name="import/data/behavior" xsi:type="string">Replace</data>
3939
<data name="import/data/validation_strategy" xsi:type="string">Stop on Error</data>

dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/Form.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ class Form extends \Magento\Mtf\Block\Form
2323
public function fill(FixtureInterface $fixture, SimpleElement $element = null)
2424
{
2525
$data = $fixture->getData();
26-
$importFile = $data['import_file'];
27-
unset($data['import_file']);
28-
$data['import_file'] = $importFile;
2926
$fields = isset($data['fields']) ? $data['fields'] : $data;
3027
$mapping = $this->dataMapping($fields);
3128
$this->_fill($mapping, $element);

0 commit comments

Comments
 (0)