Skip to content

Commit 030feee

Browse files
committed
MAGETWO-55156: [Backport] If custom text area attribute is created, you can't export bundle product. - for 2.0
1 parent fe70565 commit 030feee

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
1010
use Magento\CatalogImportExport\Model\Import\Product as ImportProductModel;
1111
use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
12-
use Magento\ImportExport\Controller\Adminhtml\Import;
1312
use Magento\ImportExport\Model\Import as ImportModel;
14-
use \Magento\Catalog\Model\Product\Type\AbstractType;
1513

1614
/**
1715
* Class RowCustomizer
@@ -309,7 +307,7 @@ protected function getNotBundleAttributes($additionalAttributes)
309307
{
310308
$filteredAttributes = [];
311309
foreach ($additionalAttributes as $code => $value) {
312-
if (!in_array('bundle_' . $code, $this->getBundleColumns())) {
310+
if (!in_array('bundle_' . $code, $this->bundleColumns)) {
313311
$filteredAttributes[] = $code . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR . $value;
314312
}
315313
}

app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function testAddData()
176176
{
177177
$preparedData = $this->rowCustomizerMock->prepareData($this->productResourceCollection, [1]);
178178
$attributes = 'attribute=1,sku_type=1,attribute2="Text",price_type=1,price_view=1,weight_type=1,'
179-
. 'values=values,shipment_type=1,attribute3=One,Two,Three';
179+
. 'values=values,attribute3=One,Two,Three';
180180
$dataRow = [
181181
'sku' => 'sku1',
182182
'additional_attributes' => $attributes

dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Export/RowCustomizerTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function testPrepareData()
4747
$this->assertEquals($select, (string)$collection->getSelect());
4848
$result = $this->model->addData(['additional_attributes' => $allAdditionalAttributes], $ids['bundle-product']);
4949
$this->assertArrayHasKey('bundle_price_type', $result);
50-
$this->assertArrayHasKey('bundle_shipment_type', $result);
5150
$this->assertArrayHasKey('bundle_sku_type', $result);
5251
$this->assertArrayHasKey('bundle_price_view', $result);
5352
$this->assertArrayHasKey('bundle_weight_type', $result);

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,13 @@ protected function setUp()
7070
public function testExport()
7171
{
7272
$this->model->setWriter(
73-
$this->objectManager->create(
73+
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
7474
\Magento\ImportExport\Model\Export\Adapter\Csv::class
7575
)
7676
);
7777
$exportData = $this->model->export();
78-
$this->assertContains('New Product', $exportData);
79-
80-
$this->assertContains('Option 1 & Value 1"', $exportData);
81-
$this->assertContains('Option 1 & Value 2"', $exportData);
82-
$this->assertContains('Option 1 & Value 3"', $exportData);
83-
$this->assertContains('Option 4 ""!@#$%^&*', $exportData);
84-
$this->assertContains('test_option_code_2', $exportData);
85-
$this->assertContains('max_characters=10', $exportData);
8678
$this->assertContains('text_attribute=!@#$%^&*()_+1234567890-=|\\:;""\'<,>.?/', $exportData);
87-
}
88-
89-
/**
90-
* @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
91-
*/
92-
public function testExportWithProductLinks()
93-
{
94-
$this->model->setWriter(
95-
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
96-
\Magento\ImportExport\Model\Export\Adapter\Csv::class
97-
)
98-
);
99-
$this->assertNotEmpty($this->model->export());
79+
$this->assertNotEmpty($exportData);
10080
}
10181

10282
/**

0 commit comments

Comments
 (0)