Merge remote-tracking branch 'chaika/MC-20112' into Chaika-PR-2019-09-20

Author: veloraven

app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php

@@ -13,6 +13,7 @@
 /**
  * Import entity abstract product type model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -543,7 +544,7 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
                 } else {
                     $resultAttrs[$attrCode] = $rowData[$attrCode];
                 }
-            } elseif (array_key_exists($attrCode, $rowData) && empty($rowData['_store'])) {
+            } elseif (array_key_exists($attrCode, $rowData)) {
                 $resultAttrs[$attrCode] = $rowData[$attrCode];
             } elseif ($withDefaultValue && null !== $attrParams['default_value'] && empty($rowData['_store'])) {
                 $resultAttrs[$attrCode] = $attrParams['default_value'];

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php

@@ -72,7 +72,9 @@ protected function setUp()
                 'setAttributeSetFilter'
             ]
         );
-        $attribute = $this->createPartialMock(\Magento\Eav\Model\Entity\Attribute::class, [
+        $attribute = $this->createPartialMock(
+            \Magento\Eav\Model\Entity\Attribute::class,
+            [
                 'getAttributeCode',
                 'getId',
                 'getIsVisible',
@@ -85,7 +87,8 @@ protected function setUp()
                 'getDefaultValue',
                 'usesSource',
                 'getFrontendInput',
-            ]);
+            ]
+        );
         $attribute->expects($this->any())->method('getIsVisible')->willReturn(true);
         $attribute->expects($this->any())->method('getIsGlobal')->willReturn(true);
         $attribute->expects($this->any())->method('getIsRequired')->willReturn(true);
@@ -107,6 +110,7 @@ protected function setUp()
         ];
         $attribute1 = clone $attribute;
         $attribute2 = clone $attribute;
+        $attribute3 = clone $attribute;
 
         $attribute1->expects($this->any())->method('getId')->willReturn('1');
         $attribute1->expects($this->any())->method('getAttributeCode')->willReturn('attr_code');
@@ -118,6 +122,11 @@ protected function setUp()
         $attribute2->expects($this->any())->method('getFrontendInput')->willReturn('boolean');
         $attribute2->expects($this->any())->method('isStatic')->willReturn(false);
 
+        $attribute3->expects($this->any())->method('getId')->willReturn('3');
+        $attribute3->expects($this->any())->method('getAttributeCode')->willReturn('text_attribute');
+        $attribute3->expects($this->any())->method('getFrontendInput')->willReturn('text');
+        $attribute3->expects($this->any())->method('isStatic')->willReturn(false);
+
         $this->entityModel->expects($this->any())->method('getEntityTypeId')->willReturn(3);
         $this->entityModel->expects($this->any())->method('getAttributeOptions')->willReturnOnConsecutiveCalls(
             ['option1', 'option2'],
@@ -126,7 +135,9 @@ protected function setUp()
         $attrSetColFactory->expects($this->any())->method('create')->willReturn($attrSetCollection);
         $attrSetCollection->expects($this->any())->method('setEntityTypeFilter')->willReturn([$attributeSet]);
         $attrColFactory->expects($this->any())->method('create')->willReturn($attrCollection);
-        $attrCollection->expects($this->any())->method('setAttributeSetFilter')->willReturn([$attribute1, $attribute2]);
+        $attrCollection->expects($this->any())
+            ->method('setAttributeSetFilter')
+            ->willReturn([$attribute1, $attribute2, $attribute3]);
         $attributeSet->expects($this->any())->method('getId')->willReturn(1);
         $attributeSet->expects($this->any())->method('getAttributeSetName')->willReturn('attribute_set_name');
 
@@ -157,23 +168,29 @@ protected function setUp()
                     ],
                 ]
             )
-            ->willReturn([$attribute1, $attribute2]);
+            ->willReturn([$attribute1, $attribute2, $attribute3]);
 
-        $this->connection = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, [
+        $this->connection = $this->createPartialMock(
+            \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
+            [
                 'select',
                 'fetchAll',
                 'fetchPairs',
                 'joinLeft',
                 'insertOnDuplicate',
                 'delete',
                 'quoteInto'
-            ]);
-        $this->select = $this->createPartialMock(\Magento\Framework\DB\Select::class, [
+            ]
+        );
+        $this->select = $this->createPartialMock(
+            \Magento\Framework\DB\Select::class,
+            [
                 'from',
                 'where',
                 'joinLeft',
                 'getConnection',
-            ]);
+            ]
+        );
         $this->select->expects($this->any())->method('from')->will($this->returnSelf());
         $this->select->expects($this->any())->method('where')->will($this->returnSelf());
         $this->select->expects($this->any())->method('joinLeft')->will($this->returnSelf());
@@ -189,10 +206,13 @@ protected function setUp()
             ->method('fetchAll')
             ->will($this->returnValue($entityAttributes));
 
-        $this->resource = $this->createPartialMock(\Magento\Framework\App\ResourceConnection::class, [
+        $this->resource = $this->createPartialMock(
+            \Magento\Framework\App\ResourceConnection::class,
+            [
                 'getConnection',
                 'getTableName',
-            ]);
+            ]
+        );
         $this->resource->expects($this->any())->method('getConnection')->will(
             $this->returnValue($this->connection)
         );
@@ -257,9 +277,13 @@ public function testIsRowValidSuccess()
         $rowNum = 1;
         $this->entityModel->expects($this->any())->method('getRowScope')->willReturn(null);
         $this->entityModel->expects($this->never())->method('addRowError');
-        $this->setPropertyValue($this->simpleType, '_attributes', [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [],
-        ]);
+        $this->setPropertyValue(
+            $this->simpleType,
+            '_attributes',
+            [
+                $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [],
+            ]
+        );
         $this->assertTrue($this->simpleType->isRowValid($rowData, $rowNum));
     }
 
@@ -278,13 +302,17 @@ public function testIsRowValidError()
                 'attr_code'
             )
             ->willReturnSelf();
-        $this->setPropertyValue($this->simpleType, '_attributes', [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [
-                'attr_code' => [
-                    'is_required' => true,
+        $this->setPropertyValue(
+            $this->simpleType,
+            '_attributes',
+            [
+                $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => [
+                    'attr_code' => [
+                        'is_required' => true,
+                    ],
                 ],
-            ],
-        ]);
+            ]
+        );
 
         $this->assertFalse($this->simpleType->isRowValid($rowData, $rowNum));
     }
@@ -364,9 +392,14 @@ public function testPrepareAttributesWithDefaultValueForSave()
     {
         $rowData = [
             '_attribute_set' => 'attributeSetName',
-            'boolean_attribute' => 'Yes'
+            'boolean_attribute' => 'Yes',
+        ];
+
+        $expected = [
+            'boolean_attribute' => 1,
+            'text_attribute' => 'default_value'
         ];
         $result = $this->simpleType->prepareAttributesWithDefaultValueForSave($rowData);
-        $this->assertEquals(['boolean_attribute' => 1], $result);
+        $this->assertEquals($expected, $result);
     }
 }