Merge pull request #625 from magento-troll/S45_Bugfixes

slopukhov · slopukhov · commit c077da60335d · 2015-09-23T16:10:51.000+03:00
[Troll] S45 bugfixes
diff --git a/app/code/Magento/Catalog/Model/Product/Link.php b/app/code/Magento/Catalog/Model/Product/Link.php
@@ -49,11 +49,17 @@ class Link extends \Magento\Framework\Model\AbstractModel
      */
     protected $_linkCollectionFactory;
 
+    /**
+     * @var \Magento\CatalogInventory\Helper\Stock
+     */
+    protected $stockHelper;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\Resource\Product\Link\CollectionFactory $linkCollectionFactory
      * @param \Magento\Catalog\Model\Resource\Product\Link\Product\CollectionFactory $productCollectionFactory
+     * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -63,12 +69,14 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Model\Resource\Product\Link\CollectionFactory $linkCollectionFactory,
         \Magento\Catalog\Model\Resource\Product\Link\Product\CollectionFactory $productCollectionFactory,
+        \Magento\CatalogInventory\Helper\Stock $stockHelper,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->_linkCollectionFactory = $linkCollectionFactory;
         $this->_productCollectionFactory = $productCollectionFactory;
+        $this->stockHelper = $stockHelper;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -128,6 +136,7 @@ public function getAttributeTypeTable($type)
     public function getProductCollection()
     {
         $collection = $this->_productCollectionFactory->create()->setLinkModel($this);
+        $this->stockHelper->addInStockFilterToCollection($collection);
         return $collection;
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php
@@ -19,6 +19,16 @@ class LinkTest extends \PHPUnit_Framework_TestCase
      */
     protected $resource;
 
+    /**
+     * @var \Magento\CatalogInventory\Helper\Stock|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $stockHelperMock;
+
+    /**
+     * @var \Magento\Catalog\Model\Resource\Product\Link\Product\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productCollection;
+
     protected function setUp()
     {
         $linkCollection = $this->getMockBuilder(
@@ -35,20 +45,20 @@ protected function setUp()
         $linkCollectionFactory->expects($this->any())
             ->method('create')
             ->will($this->returnValue($linkCollection));
-        $productCollection = $this->getMockBuilder(
+        $this->productCollection = $this->getMockBuilder(
             'Magento\Catalog\Model\Resource\Product\Link\Product\Collection'
         )->disableOriginalConstructor()->setMethods(
             ['setLinkModel']
         )->getMock();
-        $productCollection->expects($this->any())->method('setLinkModel')->will($this->returnSelf());
+        $this->productCollection->expects($this->any())->method('setLinkModel')->will($this->returnSelf());
         $productCollectionFactory = $this->getMockBuilder(
             'Magento\Catalog\Model\Resource\Product\Link\Product\CollectionFactory'
         )->disableOriginalConstructor()->setMethods(
             ['create']
         )->getMock();
         $productCollectionFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($productCollection));
+            ->will($this->returnValue($this->productCollection));
 
         $this->resource = $this->getMock(
             'Magento\Framework\Model\Resource\AbstractResource',
@@ -63,11 +73,19 @@ protected function setUp()
             ]
         );
 
+        $this->stockHelperMock = $this->getMockBuilder('Magento\CatalogInventory\Helper\Stock')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManager->getObject(
             'Magento\Catalog\Model\Product\Link',
-            ['linkCollectionFactory' => $linkCollectionFactory, 'productCollectionFactory' => $productCollectionFactory,
-                'resource' => $this->resource]
+            [
+                'linkCollectionFactory' => $linkCollectionFactory,
+                'productCollectionFactory' => $productCollectionFactory,
+                'resource' => $this->resource,
+                'stockHelper' => $this->stockHelperMock
+            ]
         );
     }
 
@@ -109,6 +127,10 @@ public function testGetAttributeTypeTable()
 
     public function testGetProductCollection()
     {
+        $this->stockHelperMock
+            ->expects($this->once())
+            ->method('addInStockFilterToCollection')
+            ->with($this->productCollection);
         $this->assertInstanceOf(
             'Magento\Catalog\Model\Resource\Product\Link\Product\Collection',
             $this->model->getProductCollection()
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php
@@ -320,12 +320,14 @@ protected function canonicalUrlRewriteGenerate()
         $urls = [];
         foreach ($this->products as $productId => $productsByStores) {
             foreach ($productsByStores as $storeId => $product) {
-                $urls[] = $this->urlRewriteFactory->create()
-                    ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
-                    ->setEntityId($productId)
-                    ->setRequestPath($this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId))
-                    ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product))
-                    ->setStoreId($storeId);
+                if ($this->productUrlPathGenerator->getUrlPath($product)) {
+                    $urls[] = $this->urlRewriteFactory->create()
+                        ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
+                        ->setEntityId($productId)
+                        ->setRequestPath($this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId))
+                        ->setTargetPath($this->productUrlPathGenerator->getCanonicalUrlPath($product))
+                        ->setStoreId($storeId);
+                }
             }
         }
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/Plugin/ImportTest.php
@@ -670,7 +670,7 @@ public function testClearProductUrls()
     /**
      * Cover canonicalUrlRewriteGenerate().
      */
-    public function testCanonicalUrlRewriteGenerate()
+    public function testCanonicalUrlRewriteGenerateWithUrlPath()
     {
         $productId = 'product_id';
         $requestPath = 'simple-product.html';
@@ -691,6 +691,10 @@ public function testCanonicalUrlRewriteGenerate()
             ->expects($this->once())
             ->method('getUrlPathWithSuffix')
             ->will($this->returnValue($requestPath));
+        $this->productUrlPathGenerator
+            ->expects($this->once())
+            ->method('getUrlPath')
+            ->will($this->returnValue('urlPath'));
         $this->productUrlPathGenerator
             ->expects($this->once())
             ->method('getCanonicalUrlPath')
@@ -734,6 +738,36 @@ public function testCanonicalUrlRewriteGenerate()
         );
     }
 
+    /**
+     * Cover canonicalUrlRewriteGenerate().
+     */
+    public function testCanonicalUrlRewriteGenerateWithEmptyUrlPath()
+    {
+        $productId = 'product_id';
+        $storeId = 10;
+        $product = $this
+            ->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productsByStores = [$storeId => $product];
+        $products = [
+            $productId => $productsByStores,
+        ];
+
+        $this->setPropertyValue($this->import, 'products', $products);
+
+        $this->productUrlPathGenerator
+            ->expects($this->once())
+            ->method('getUrlPath')
+            ->will($this->returnValue(''));
+        $this->urlRewriteFactory
+            ->expects($this->never())
+            ->method('create');
+
+        $actualResult = $this->invokeMethod($this->import, 'canonicalUrlRewriteGenerate');
+        $this->assertEquals([], $actualResult);
+    }
+
     /**
      * Cover categoriesUrlRewriteGenerate().
      */
diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -199,8 +199,6 @@ protected function _getCollection()
         );
         $this->_addProductAttributesAndPrices($collection);
 
-        $this->stockHelper->addInStockFilterToCollection($collection);
-
         return $collection;
     }
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php b/dev/tests/api-functional/framework/Magento/TestFramework/Bootstrap/WebapiDocBlock.php
@@ -18,7 +18,7 @@ class WebapiDocBlock extends \Magento\TestFramework\Bootstrap\DocBlock
     protected function _getSubscribers(\Magento\TestFramework\Application $application)
     {
         $subscribers = parent::_getSubscribers($application);
-        array_unshift($subscribers, new \Magento\TestFramework\Annotation\ApiDataFixture($this->_fixturesBaseDir));
+        $subscribers[] = new \Magento\TestFramework\Annotation\ApiDataFixture($this->_fixturesBaseDir);
         return $subscribers;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php
@@ -9,6 +9,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class ProductLinkManagementInterfaceTest extends WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductLinkManagementV1';
@@ -85,7 +88,7 @@ protected function assertLinkedProducts($productSku, $linkType)
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual_in_stock.php
      */
     public function testAssign()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -6,9 +6,13 @@
 namespace Magento\Catalog\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class ProductRepositoryInterfaceTest extends WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductRepositoryV1';
@@ -139,6 +143,9 @@ public function testProductLinks()
             ProductInterface::STATUS => 1,
             ProductInterface::TYPE_ID => 'simple',
             ProductInterface::ATTRIBUTE_SET_ID => 4,
+            ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
+                'stock_item' => $this->getStockItemData()
+            ]
         ];
 
         $this->saveProduct($productData);
@@ -778,4 +785,36 @@ public function testTierPrices()
         $response = $this->deleteProduct($productData[ProductInterface::SKU]);
         $this->assertTrue($response);
     }
+
+    /**
+     * @return array
+     */
+    private function getStockItemData()
+    {
+        return [
+            StockItemInterface::IS_IN_STOCK => 1,
+            StockItemInterface::QTY => 100500,
+            StockItemInterface::IS_QTY_DECIMAL => 1,
+            StockItemInterface::SHOW_DEFAULT_NOTIFICATION_MESSAGE => 0,
+            StockItemInterface::USE_CONFIG_MIN_QTY => 0,
+            StockItemInterface::USE_CONFIG_MIN_SALE_QTY => 0,
+            StockItemInterface::MIN_QTY => 1,
+            StockItemInterface::MIN_SALE_QTY => 1,
+            StockItemInterface::MAX_SALE_QTY => 100,
+            StockItemInterface::USE_CONFIG_MAX_SALE_QTY => 0,
+            StockItemInterface::USE_CONFIG_BACKORDERS => 0,
+            StockItemInterface::BACKORDERS => 0,
+            StockItemInterface::USE_CONFIG_NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::USE_CONFIG_QTY_INCREMENTS => 0,
+            StockItemInterface::QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_ENABLE_QTY_INC => 0,
+            StockItemInterface::ENABLE_QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_MANAGE_STOCK => 1,
+            StockItemInterface::MANAGE_STOCK => 1,
+            StockItemInterface::LOW_STOCK_DATE => null,
+            StockItemInterface::IS_DECIMAL_DIVIDED => 0,
+            StockItemInterface::STOCK_STATUS_CHANGED_AUTO => 0,
+        ];
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductLinkManagementTest.php
@@ -6,6 +6,9 @@
  */
 namespace Magento\GroupedProduct\Api;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class ProductLinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductLinkManagementV1';
diff --git a/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/GroupedProduct/Api/ProductRepositoryInterfaceTest.php
@@ -6,6 +6,7 @@
 namespace Magento\GroupedProduct\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 class ProductRepositoryInterfaceTest extends WebapiAbstract
@@ -126,6 +127,9 @@ public function testProductLinks()
             ProductInterface::STATUS => 1,
             ProductInterface::TYPE_ID => 'simple',
             ProductInterface::ATTRIBUTE_SET_ID => 4,
+            ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
+                'stock_item' => $this->getStockItemData()
+            ]
         ];
 
         $this->saveProduct($productData);
@@ -200,4 +204,36 @@ public function testProductLinks()
         $this->deleteProduct("product_simple_500");
         $this->deleteProduct("group_product_500");
     }
+
+    /**
+     * @return array
+     */
+    private function getStockItemData()
+    {
+        return [
+            StockItemInterface::IS_IN_STOCK => 1,
+            StockItemInterface::QTY => 100500,
+            StockItemInterface::IS_QTY_DECIMAL => 1,
+            StockItemInterface::SHOW_DEFAULT_NOTIFICATION_MESSAGE => 0,
+            StockItemInterface::USE_CONFIG_MIN_QTY => 0,
+            StockItemInterface::USE_CONFIG_MIN_SALE_QTY => 0,
+            StockItemInterface::MIN_QTY => 1,
+            StockItemInterface::MIN_SALE_QTY => 1,
+            StockItemInterface::MAX_SALE_QTY => 100,
+            StockItemInterface::USE_CONFIG_MAX_SALE_QTY => 0,
+            StockItemInterface::USE_CONFIG_BACKORDERS => 0,
+            StockItemInterface::BACKORDERS => 0,
+            StockItemInterface::USE_CONFIG_NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::NOTIFY_STOCK_QTY => 0,
+            StockItemInterface::USE_CONFIG_QTY_INCREMENTS => 0,
+            StockItemInterface::QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_ENABLE_QTY_INC => 0,
+            StockItemInterface::ENABLE_QTY_INCREMENTS => 0,
+            StockItemInterface::USE_CONFIG_MANAGE_STOCK => 1,
+            StockItemInterface::MANAGE_STOCK => 1,
+            StockItemInterface::LOW_STOCK_DATE => null,
+            StockItemInterface::IS_DECIMAL_DIVIDED => 0,
+            StockItemInterface::STOCK_STATUS_CHANGED_AUTO => 0,
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
+    ->setId(21)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Virtual Product')
+    ->setSku('virtual-product')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['is_in_stock' => 1])
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Catalog\Model\Product');
+$product->load(21);
+if ($product->getId()) {
+    $product->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped.php

Original file line number	Diff line number	Diff line change
`@@ -199,8 +199,6 @@ protected function _getCollection()`
`199`	`199`	`);`
`200`	`200`	`$this->_addProductAttributesAndPrices($collection);`
`201`	`201`
`202`		`- $this->stockHelper->addInStockFilterToCollection($collection);`
`203`		`-`
`204`	`202`	`return $collection;`
`205`	`203`	`}`
`206`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class WebapiDocBlock extends \Magento\TestFramework\Bootstrap\DocBlock`
`18`	`18`	`protected function _getSubscribers(\Magento\TestFramework\Application $application)`
`19`	`19`	`{`
`20`	`20`	`$subscribers = parent::_getSubscribers($application);`
`21`		`- array_unshift($subscribers, new \Magento\TestFramework\Annotation\ApiDataFixture($this->_fixturesBaseDir));`
	`21`	`+ $subscribers[] = new \Magento\TestFramework\Annotation\ApiDataFixture($this->_fixturesBaseDir);`
`22`	`22`	`return $subscribers;`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`*/`
`7`	`7`	`namespace Magento\GroupedProduct\Api;`
`8`	`8`
	`9`	`+/**`
	`10`	`+ * @magentoAppIsolation enabled`
	`11`	`+ */`
`9`	`12`	`class ProductLinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract`
`10`	`13`	`{`
`11`	`14`	`const SERVICE_NAME = 'catalogProductLinkManagementV1';`