Merge branch 'MAGETWO-61151' into 2.0-develop-pr4

Author: OlgaVasyltsun

app/code/Magento/Checkout/Model/Cart.php

@@ -335,10 +335,6 @@ protected function _getProductRequest($requestInfo)
             );
         }
 
-        if (!$request->hasQty()) {
-            $request->setQty(1);
-        }
-
         $this->getRequestInfoFilter()->filter($request);
         return $request;
     }
@@ -364,7 +360,7 @@ public function addProduct($productInfo, $requestInfo = null)
             //If product was not found in cart and there is set minimal qty for it
             if ($minimumQty
                 && $minimumQty > 0
-                && $request->getQty() < $minimumQty
+                && !$request->getQty()
                 && !$this->getQuote()->hasProductId($productId)
             ) {
                 $request->setQty($minimumQty);
@@ -704,7 +700,7 @@ public function updateItem($itemId, $requestInfo = null, $updatingParams = null)
                 // If product was not found in cart and there is set minimal qty for it
                 if ($minimumQty
                     && $minimumQty > 0
-                    && $request->getQty() < $minimumQty
+                    && !$request->getQty()
                     && !$this->getQuote()->hasProductId($productId)
                 ) {
                     $request->setQty($minimumQty);

dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class CartTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Cart
+     */
+    private $cart;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->cart = Bootstrap::getObjectManager()->create(Cart::class);
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/set_product_min_in_cart.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testAddProductWithLowerQty()
+    {
+        $this->setExpectedException(
+            \Magento\Framework\Exception\LocalizedException::class,
+            'The fewest you may purchase is 3'
+        );
+        $product = $this->productRepository->get('simple');
+        $this->cart->addProduct($product->getId(), ['qty' => 1]);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/set_product_min_in_cart.php
+     * @magentoDbIsolation enabled
+     */
+    public function testAddProductWithNoQty()
+    {
+        $product = $this->productRepository->get('simple');
+        $this->cart->addProduct($product->getId(), []);
+    }
+}

dev/tests/integration/testsuite/Magento/Checkout/_files/set_product_min_in_cart.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include 'simple_product.php';
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product->setStockData(['use_config_manage_stock' => 0, 'min_sale_qty' => 3]);
+$product->save();