MAGETWO-49201: Grouped and Bundle product fixes

Author: Oleksandr Iegorov

app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php

@@ -20,6 +20,7 @@
 use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Store\Api\Data\StoreInterface;
 
 /**
  * Class GroupedTest
@@ -75,6 +76,11 @@ class GroupedTest extends AbstractModifierTest
      */
     protected $attributeSetRepositoryMock;
 
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
 
     protected function setUp()
     {
@@ -137,9 +143,15 @@ protected function setUp()
             ->method('get')
             ->with(self::LINKED_PRODUCT_SKU)
             ->willReturn($this->linkedProductMock);
+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
         $this->locatorMock->expects($this->any())
             ->method('getProduct')
             ->willReturn($this->productMock);
+        $this->locatorMock->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
     }
 
     /**
@@ -208,6 +220,9 @@ public function testModifyData()
                         ],
                     ],
                 ],
+                'product' => [
+                    'current_store_id' => null
+                ],
             ],
         ];
         $this->assertSame($expectedData, $this->getModel()->modifyData([]));

app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php

@@ -150,7 +150,6 @@ public function modifyData(array $data)
                         ->getAttributeSetName(),
                 ];
             }
-
             $data[$modelId][self::DATA_SOURCE_DEFAULT]['current_store_id'] = $storeId;
         }
         return $data;