Merge branch 'MAGETWO-80426' into 2.1.13-PR-0.4

Author: dhorytskyi

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -550,7 +550,7 @@ public function testGetCustomAttributes()
         $this->assertEquals("description", $this->category->getCustomAttribute($descriptionAttributeCode)->getValue());
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->category->setData($descriptionAttributeCode, "new description");
+        $this->category->setCustomAttribute($descriptionAttributeCode, "new description");
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
         $this->assertNotNull($this->category->getCustomAttribute($descriptionAttributeCode));
         $this->assertEquals(

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1247,7 +1247,7 @@ public function testGetCustomAttributes()
         $this->assertEquals("red", $this->model->getCustomAttribute($colorAttributeCode)->getValue());
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->model->setData($colorAttributeCode, "blue");
+        $this->model->setCustomAttribute($colorAttributeCode, "blue");
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
         $this->assertNotNull($this->model->getCustomAttribute($colorAttributeCode));
         $this->assertEquals("blue", $this->model->getCustomAttribute($colorAttributeCode)->getValue());

lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php

@@ -113,7 +113,12 @@ protected function initializeCustomAttributes()
             $customAttributeCodes = $this->getCustomAttributesCodes();
 
             foreach ($customAttributeCodes as $customAttributeCode) {
-                if (isset($this->_data[$customAttributeCode])) {
+                if (isset($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode])) {
+                    $customAttribute = $this->customAttributeFactory->create()
+                        ->setAttributeCode($customAttributeCode)
+                        ->setValue($this->_data[self::CUSTOM_ATTRIBUTES][$customAttributeCode]->getValue());
+                    $customAttributes[$customAttributeCode] = $customAttribute;
+                } elseif (isset($this->_data[$customAttributeCode])) {
                     $customAttribute = $this->customAttributeFactory->create()
                         ->setAttributeCode($customAttributeCode)
                         ->setValue($this->_data[$customAttributeCode]);