ACP2E-1136: Product website assignment can be removed from REST API, but admin UI still does not reflect that

Author: Anna Bukatar

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php

@@ -76,16 +76,24 @@ class WebsitesTest extends AbstractModifierTest
      */
     protected $storeViewMock;
 
+    /**
+     * @var array
+     */
+    private $websitesList;
+
+    /**
+     * @var int
+     */
+    private $productId;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
-        $this->productMock->expects($this->any())
-            ->method('getId')
-            ->willReturn(self::PRODUCT_ID);
         $this->assignedWebsites = [self::SECOND_WEBSITE_ID];
+        $this->productId = self::PRODUCT_ID;
         $this->websiteMock = $this->getMockBuilder(Website::class)
             ->setMethods(['getId', 'getName'])
             ->disableOriginalConstructor()
@@ -94,6 +102,7 @@ protected function setUp(): void
             ->setMethods(['getId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->websitesList = [$this->websiteMock, $this->secondWebsiteMock];
         $this->websiteRepositoryMock = $this->getMockBuilder(WebsiteRepositoryInterface::class)
             ->setMethods(['getList'])
             ->getMockForAbstractClass();
@@ -106,17 +115,9 @@ protected function setUp(): void
         $this->storeRepositoryMock = $this->getMockBuilder(StoreRepositoryInterface::class)
             ->setMethods(['getList'])
             ->getMockForAbstractClass();
-        $this->productMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['getId'])
-            ->getMockForAbstractClass();
-        $this->locatorMock->expects($this->any())
-            ->method('getWebsiteIds')
-            ->willReturn($this->assignedWebsites);
         $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
             ->setMethods(['isSingleStoreMode', 'getWebsites'])
             ->getMockForAbstractClass();
-        $this->storeManagerMock->method('getWebsites')
-            ->willReturn([$this->websiteMock, $this->secondWebsiteMock]);
         $this->storeManagerMock->expects($this->any())
             ->method('isSingleStoreMode')
             ->willReturn(false);
@@ -174,12 +175,30 @@ protected function createModel()
         );
     }
 
+    /**
+     * Initialize return values
+     * @return void
+     */
+    private function init()
+    {
+        $this->productMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($this->productId);
+        $this->locatorMock->expects($this->any())
+            ->method('getWebsiteIds')
+            ->willReturn($this->assignedWebsites);
+        $this->storeManagerMock->method('getWebsites')
+            ->willReturn($this->websitesList);
+    }
+
     /**
      * @return void
      */
     public function testModifyMeta()
     {
+        $this->init();
         $meta = $this->getModel()->modifyMeta([]);
+
         $this->assertArrayHasKey('websites', $meta);
         $this->assertArrayHasKey(self::SECOND_WEBSITE_ID, $meta['websites']['children']);
         $this->assertArrayHasKey(self::WEBSITE_ID, $meta['websites']['children']);
@@ -190,7 +209,7 @@ public function testModifyMeta()
         );
         $this->assertEquals(
             $meta['websites']['children'][self::WEBSITE_ID]['arguments']['data']['config']['value'],
-            "0"
+            '0'
         );
     }
 
@@ -214,10 +233,44 @@ public function testModifyData()
                 ]
             ],
         ];
+        $this->init();
 
         $this->assertEquals(
             $expectedData,
             $this->getModel()->modifyData([])
         );
     }
+
+    public function testModifyDataNoWebsitesExistingProduct()
+    {
+        $this->assignedWebsites = [];
+        $this->websitesList = [$this->websiteMock];
+        $this->init();
+
+        $meta = $this->getModel()->modifyMeta([]);
+
+        $this->assertArrayHasKey(self::WEBSITE_ID, $meta['websites']['children']);
+        $this->assertArrayHasKey('copy_to_stores.' . self::WEBSITE_ID, $meta['websites']['children']);
+        $this->assertEquals('0',
+            $meta['websites']['children'][self::WEBSITE_ID]['arguments']['data']['config']['value']
+        );
+    }
+
+    public function testModifyDataNoWebsitesNewProduct()
+    {
+        $this->assignedWebsites = [];
+        $this->websitesList = [$this->websiteMock];
+        $this->productId = false;
+        $this->init();
+        $this->productMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(false);
+
+        $meta = $this->getModel()->modifyMeta([]);
+
+        $this->assertArrayHasKey(self::WEBSITE_ID, $meta['websites']['children']);
+        $this->assertEquals('1',
+            $meta['websites']['children'][self::WEBSITE_ID]['arguments']['data']['config']['value']
+        );
+    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

@@ -23,7 +23,7 @@
  */
 class Websites extends AbstractModifier
 {
-    const SORT_ORDER = 40;
+    public const SORT_ORDER = 40;
 
     /**
      * @var LocatorInterface