MC-37665: Updating a category through the REST API will uncheck "Use Default Value" on a bunch of attributes

Author: Viktor Kopin

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

@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\CategoryRepository;
+use Magento\Catalog\Model\CategoryRepository\PopulateWithValues;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityMetadata;
@@ -63,6 +64,11 @@ class CategoryRepositoryTest extends TestCase
      */
     protected $metadataPoolMock;
 
+    /**
+     * @var MockObject
+     */
+    protected $populateWithValuesMock;
+
     protected function setUp(): void
     {
         $this->categoryFactoryMock = $this->createPartialMock(
@@ -94,6 +100,12 @@ protected function setUp(): void
             ->with(CategoryInterface::class)
             ->willReturn($metadataMock);
 
+        $this->populateWithValuesMock = $this
+            ->getMockBuilder(PopulateWithValues::class)
+            ->setMethods(['execute'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = (new ObjectManager($this))->getObject(
             CategoryRepository::class,
             [
@@ -102,6 +114,7 @@ protected function setUp(): void
                 'storeManager' => $this->storeManagerMock,
                 'metadataPool' => $this->metadataPoolMock,
                 'extensibleDataObjectConverter' => $this->extensibleDataObjectConverterMock,
+                'populateWithValues' => $this->populateWithValuesMock,
             ]
         );
     }
@@ -202,7 +215,7 @@ public function testFilterExtraFieldsOnUpdateCategory($categoryId, $categoryData
             ->method('toNestedArray')
             ->willReturn($categoryData);
         $categoryMock->expects($this->once())->method('validate')->willReturn(true);
-        $categoryMock->expects($this->once())->method('addData')->with($dataForSave);
+        $this->populateWithValuesMock->expects($this->once())->method('execute')->with($categoryMock, $dataForSave);
         $this->categoryResourceMock->expects($this->once())
             ->method('save')
             ->willReturn(DataObject::class);
@@ -230,11 +243,11 @@ public function testCreateNewCategory()
 
         $categoryMock->expects($this->once())->method('getParentId')->willReturn($parentCategoryId);
         $parentCategoryMock->expects($this->once())->method('getPath')->willReturn('path');
-        $categoryMock->expects($this->once())->method('addData')->with($dataForSave);
         $categoryMock->expects($this->once())->method('validate')->willReturn(true);
         $this->categoryResourceMock->expects($this->once())
             ->method('save')
             ->willReturn(DataObject::class);
+        $this->populateWithValuesMock->expects($this->once())->method('execute')->with($categoryMock, $dataForSave);
         $this->assertEquals($categoryMock, $this->model->save($categoryMock));
     }