MAGETWO-59916: Problem arose when applying a coupon. ~QUANS~

Author: irenelagno

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

@@ -90,26 +90,17 @@ public function execute()
 
             if ($codeLength) {
                 $escaper = $this->_objectManager->get(\Magento\Framework\Escaper::class);
+                $coupon = $this->couponFactory->create();
+                $coupon->load($couponCode, 'code');
                 if (!$itemsCount) {
-                    if ($isCodeLengthValid) {
-                        $coupon = $this->couponFactory->create();
-                        $coupon->load($couponCode, 'code');
-                        if ($coupon->getId()) {
-                            $this->_checkoutSession->getQuote()->setCouponCode($couponCode)->save();
-                            $this->messageManager->addSuccess(
-                                __(
-                                    'You used coupon code "%1".',
-                                    $escaper->escapeHtml($couponCode)
-                                )
-                            );
-                        } else {
-                            $this->messageManager->addError(
-                                __(
-                                    'The coupon code "%1" is not valid.',
-                                    $escaper->escapeHtml($couponCode)
-                                )
-                            );
-                        }
+                    if ($isCodeLengthValid && $coupon->getId()) {
+                        $this->_checkoutSession->getQuote()->setCouponCode($couponCode)->save();
+                        $this->messageManager->addSuccess(
+                            __(
+                                'You used coupon code "%1".',
+                                $escaper->escapeHtml($couponCode)
+                            )
+                        );
                     } else {
                         $this->messageManager->addError(
                             __(
@@ -119,7 +110,7 @@ public function execute()
                         );
                     }
                 } else {
-                    if ($isCodeLengthValid && $couponCode == $cartQuote->getCouponCode()) {
+                    if ($isCodeLengthValid && $coupon->getId() && $couponCode == $cartQuote->getCouponCode()) {
                         $this->messageManager->addSuccess(
                             __(
                                 'You used coupon code "%1".',

app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php

@@ -69,6 +69,16 @@ class CouponPostTest extends \PHPUnit_Framework_TestCase
      */
     protected $quoteRepository;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirect;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectFactory;
+
     /**
      * @return void
      */
@@ -204,6 +214,12 @@ public function testExecuteWithGoodCouponAndItems()
             ->method('getCouponCode')
             ->willReturn('OLDCODE');
 
+        $coupon = $this->getMock(\Magento\SalesRule\Model\Coupon::class, [], [], '', false);
+        $this->couponFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($coupon);
+        $coupon->expects($this->once())->method('load')->willReturnSelf();
+        $coupon->expects($this->once())->method('getId')->willReturn(1);
         $this->quote->expects($this->any())
             ->method('getItemsCount')
             ->willReturn(1);

dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Controller\Cart\Index;
+
+class CouponPostTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+    /**
+     * Test for \Magento\Checkout\Controller\Cart\CouponPost::execute() with simple product
+     *
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product.php
+     */
+    public function testExecute()
+    {
+        /** @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)->save();
+        $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);
+    }
+}