MAGETWO-92693: Some improvements on product create|edit page in admin area

AVoskoboinikov · AVoskoboinikov · commit f2a82b124206 · 2018-06-15T17:29:17.000+03:00
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -55,6 +55,7 @@ class Builder
      * @param Registry $registry
      * @param WysiwygModel\Config $wysiwygConfig
      * @param StoreFactory|null $storeFactory
+     * @param ProductRepositoryInterface|null $productRepository
      */
     public function __construct(
         ProductFactory $productFactory,
@@ -84,7 +85,7 @@ public function __construct(
     public function build(RequestInterface $request)
     {
         $productId = (int) $request->getParam('id');
-        $storeId = (int) $request->getParam('store', 0);
+        $storeId = $request->getParam('store', 0);
         $attributeSetId = (int) $request->getParam('set');
         $typeId = $request->getParam('type');
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
@@ -14,6 +14,9 @@
 use Magento\Framework\Registry;
 use Magento\Cms\Model\Wysiwyg\Config as WysiwygConfig;
 use Magento\Framework\App\Request\Http;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Model\Product\Type as ProductTypes;
 
 /**
  * Class BuilderTest
@@ -67,6 +70,11 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
      */
     protected $storeFactoryMock;
 
+    /**
+     * @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productRepositoryMock;
+
     /**
      * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -90,9 +98,10 @@ protected function setUp()
             ->setMethods(['load'])
             ->getMockForAbstractClass();
 
-        $this->storeFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->storeMock);
+        $this->productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->setMethods(['getById'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
         $this->builder = $this->objectManager->getObject(
             Builder::class,
@@ -102,140 +111,198 @@ protected function setUp()
                 'registry' => $this->registryMock,
                 'wysiwygConfig' => $this->wysiwygConfigMock,
                 'storeFactory' => $this->storeFactoryMock,
+                'productRepository' => $this->productRepositoryMock
             ]
         );
     }
 
     public function testBuildWhenProductExistAndPossibleToLoadProduct()
     {
+        $productId = 2;
+        $productType = 'type_id';
+        $productStore = 'store';
+        $productSet = 3;
+
         $valueMap = [
-            ['id', null, 2],
-            ['store', 0, 'some_store'],
-            ['type', null, 'type_id'],
-            ['set', null, 3],
-            ['store', null, 'store'],
+            ['id', null, $productId],
+            ['type', null, $productType],
+            ['set', null, $productSet],
+            ['store', 0, $productStore],
         ];
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap($valueMap);
-        $this->productFactoryMock->expects($this->once())
+
+        $this->productRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->with($productId, true, $productStore)
+            ->willReturn($this->productMock);
+
+        $this->storeFactoryMock->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($this->productMock));
-        $this->productMock->expects($this->once())
-            ->method('setStoreId')
-            ->with('some_store')
-            ->willReturnSelf();
-        $this->productMock->expects($this->never())
-            ->method('setTypeId');
-        $this->productMock->expects($this->once())
+            ->willReturn($this->storeMock);
+
+        $this->storeMock->expects($this->any())
             ->method('load')
-            ->with(2)
-            ->will($this->returnSelf());
-        $this->productMock->expects($this->once())
-            ->method('setAttributeSetId')
-            ->with(3)
-            ->will($this->returnSelf());
+            ->with($productStore)
+            ->willReturnSelf();
+
         $registryValueMap = [
             ['product', $this->productMock, $this->registryMock],
             ['current_product', $this->productMock, $this->registryMock],
+            ['current_store', $this->registryMock, $this->storeMock],
         ];
+
         $this->registryMock->expects($this->any())
             ->method('register')
             ->willReturn($registryValueMap);
+
         $this->wysiwygConfigMock->expects($this->once())
             ->method('setStoreId')
-            ->with('store');
+            ->with($productStore);
+
         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
     }
 
     public function testBuildWhenImpossibleLoadProduct()
     {
+        $productId = 2;
+        $productType = 'type_id';
+        $productStore = 'store';
+        $productSet = 3;
+
         $valueMap = [
-            ['id', null, 15],
-            ['store', 0, 'some_store'],
-            ['type', null, 'type_id'],
-            ['set', null, 3],
-            ['store', null, 'store'],
+            ['id', null, $productId],
+            ['type', null, $productType],
+            ['set', null, $productSet],
+            ['store', 0, $productStore],
         ];
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->will($this->returnValueMap($valueMap));
+            ->willReturnMap($valueMap);
+
+        $this->productRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->with($productId, true, $productStore)
+            ->willThrowException(new NoSuchEntityException());
+
         $this->productFactoryMock->expects($this->once())
             ->method('create')
-            ->willReturn($this->productMock);
-        $this->productMock->expects($this->once())
-            ->method('setStoreId')
-            ->with('some_store')
-            ->willReturnSelf();
-        $this->productMock->expects($this->once())
+            ->will($this->returnValue($this->productMock));
+
+        $this->productMock->expects($this->any())
+            ->method('setData')
+            ->with('_edit_mode', true);
+
+        $this->productMock->expects($this->any())
             ->method('setTypeId')
-            ->with(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE)
-            ->willReturnSelf();
-        $this->productMock->expects($this->once())
-            ->method('load')
-            ->with(15)
-            ->willThrowException(new \Exception());
+            ->with(ProductTypes::DEFAULT_TYPE);
+
+        $this->productMock->expects($this->any())
+            ->method('setStoreId')
+            ->with($productStore);
+
+        $this->productMock->expects($this->any())
+            ->method('setAttributeSetId')
+            ->with($productSet);
+
         $this->loggerMock->expects($this->once())
             ->method('critical');
-        $this->productMock->expects($this->once())
-            ->method('setAttributeSetId')
-            ->with(3)
-            ->will($this->returnSelf());
+
+        $this->storeFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->storeMock);
+
+        $this->storeMock->expects($this->any())
+            ->method('load')
+            ->with($productStore)
+            ->willReturnSelf();
+
         $registryValueMap = [
             ['product', $this->productMock, $this->registryMock],
             ['current_product', $this->productMock, $this->registryMock],
+            ['current_store', $this->registryMock, $this->storeMock],
         ];
+
         $this->registryMock->expects($this->any())
             ->method('register')
-            ->will($this->returnValueMap($registryValueMap));
+            ->willReturn($registryValueMap);
+
         $this->wysiwygConfigMock->expects($this->once())
             ->method('setStoreId')
-            ->with('store');
+            ->with($productStore);
+
         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
     }
 
     public function testBuildWhenProductNotExist()
     {
+        $productId = 0;
+        $productType = 'type_id';
+        $productStore = 'store';
+        $productSet = 3;
+
         $valueMap = [
-            ['id', null, null],
-            ['store', 0, 'some_store'],
-            ['type', null, 'type_id'],
-            ['set', null, 3],
-            ['store', null, 'store'],
+            ['id', null, $productId],
+            ['type', null, $productType],
+            ['set', null, $productSet],
+            ['store', 0, $productStore],
         ];
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->will($this->returnValueMap($valueMap));
+            ->willReturnMap($valueMap);
+
+        $this->productRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->with($productId, true, $productStore)
+            ->willThrowException(new NoSuchEntityException());
+
         $this->productFactoryMock->expects($this->once())
             ->method('create')
-            ->willReturn($this->productMock);
-        $this->productMock->expects($this->once())
-            ->method('setStoreId')
-            ->with('some_store')
-            ->willReturnSelf();
-        $productValueMap = [
-            ['type_id', $this->productMock],
-            [\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE, $this->productMock],
-        ];
+            ->will($this->returnValue($this->productMock));
+
+        $this->productMock->expects($this->any())
+            ->method('setData')
+            ->with('_edit_mode', true);
+
         $this->productMock->expects($this->any())
             ->method('setTypeId')
-            ->willReturnMap($productValueMap);
-        $this->productMock->expects($this->never())
-            ->method('load');
-        $this->productMock->expects($this->once())
+            ->with($productType);
+
+        $this->productMock->expects($this->any())
+            ->method('setStoreId')
+            ->with($productStore);
+
+        $this->productMock->expects($this->any())
             ->method('setAttributeSetId')
-            ->with(3)
-            ->will($this->returnSelf());
+            ->with($productSet);
+
+        $this->storeFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->storeMock);
+
+        $this->storeMock->expects($this->any())
+            ->method('load')
+            ->with($productStore)
+            ->willReturnSelf();
+
         $registryValueMap = [
             ['product', $this->productMock, $this->registryMock],
             ['current_product', $this->productMock, $this->registryMock],
+            ['current_store', $this->registryMock, $this->storeMock],
         ];
+
         $this->registryMock->expects($this->any())
             ->method('register')
-            ->will($this->returnValueMap($registryValueMap));
+            ->willReturn($registryValueMap);
+
         $this->wysiwygConfigMock->expects($this->once())
             ->method('setStoreId')
-            ->with('store');
+            ->with($productStore);
+
         $this->assertEquals($this->productMock, $this->builder->build($this->requestMock));
     }
 }
