Merge branch 'MAGETWO-60352' of github.com:magento-troll/magento2ce into PR_Troll

Author: slopukhov

app/code/Magento/Checkout/Controller/Cart/CouponPost.php

@@ -124,7 +124,6 @@ public function execute()
                                 $escaper->escapeHtml($couponCode)
                             )
                         );
-                        $this->cart->save();
                     }
                 }
             } else {

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php

@@ -64,4 +64,31 @@ private function _getQuoteItemIdByProductId(\Magento\Quote\Model\Quote $quote, $
         }
         return null;
     }
+
+    /**
+     * Test for \Magento\Checkout\Controller\Cart\CouponPost::execute() with configurable product with last option
+     * Covers MAGETWO-60352
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product_last_variation.php
+     */
+    public function testExecuteForConfigurableLastOption()
+    {
+        /** @var $session \Magento\Checkout\Model\Session */
+        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        $quote = $session->getQuote();
+        $quote->setData('trigger_recollect', 1)->setTotalsCollectedFlag(true);
+        $inputData = [
+            'remove' => 0,
+            'coupon_code' => 'test'
+        ];
+        $this->getRequest()->setPostValue($inputData);
+        $this->dispatch(
+            'checkout/cart/couponPost/'
+        );
+
+        $this->assertSessionMessages(
+            $this->equalTo(['The coupon code "test" is not valid.']),
+            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/quote_with_configurable_product_last_variation.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+require __DIR__ . '/configurable_products.php';
+
+/** @var \Magento\Quote\Model\Quote $quote */
+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+
+$product = $productRepository->getById(10);
+$product->setStockData(['use_config_manage_stock' => 1, 'qty' => 1, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+$productRepository->save($product);
+
+$product = $productRepository->getById(20);
+$product->setStockData(['use_config_manage_stock' => 1, 'qty' => 0, 'is_qty_decimal' => 0, 'is_in_stock' => 0]);
+$productRepository->save($product);
+
+/** @var \Magento\Quote\Model\Quote $quote */
+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$request = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Framework\DataObject::class);
+
+/** @var \Magento\Eav\Model\Config $eavConfig */
+$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+/** @var  $attribute */
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+
+$request->setData(
+    [
+        'product_id' => $productRepository->get('configurable')->getId(),
+        'selected_configurable_option' => '1',
+        'super_attribute' => [
+            $attribute->getAttributeId() => $attribute->getOptions()[1]->getValue()
+        ],
+        'qty' => '1'
+    ]
+);
+
+$quote->setStoreId(
+        1
+    )->setIsActive(
+        true
+    )->setIsMultiShipping(
+        false
+    )->setReservedOrderId(
+        'test_order_with_configurable_product'
+    )->setEmail(
+        'store@example.com'
+    )->addProduct(
+        $productRepository->get('configurable'),
+        $request
+    );
+
+/** @var \Magento\Quote\Model\QuoteRepository $quoteRepository */
+$quoteRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Quote\Model\QuoteRepository::class
+);
+$quote->collectTotals();
+$quoteRepository->save($quote);
+
+/** @var \Magento\Checkout\Model\Session $session */
+$session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Checkout\Model\Session::class
+);
+$session->setQuoteId($quote->getId());

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/quote_with_configurable_product_last_variation_rollback.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Rollback for quote_with_configurable_product_last_variation.php fixture.
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_with_configurable_product', 'reserved_order_id')->delete();