Merge pull request #3046 from magento-architects/MAGETWO-94207-REST-400

[architects] MAGETWO-94207: Cart GET for customer in REST returns 400 when cart not created

Author: cpartica

app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php

@@ -56,7 +56,7 @@ public function getOverriddenValue()
                 }
             }
         } catch (NoSuchEntityException $e) {
-            /* do nothing and just return null */
+            throw new NoSuchEntityException(__('Current customer does not have an active cart.'));
         }
         return null;
     }

app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php

@@ -67,6 +67,9 @@ public function testGetOverriddenValueIsCustomerAndCartExists()
         $this->assertSame($retValue, $this->model->getOverriddenValue());
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testGetOverriddenValueIsCustomerAndCartDoesNotExist()
     {
         $customerId = 1;
@@ -83,7 +86,7 @@ public function testGetOverriddenValueIsCustomerAndCartDoesNotExist()
             ->with($customerId)
             ->will($this->throwException(new NoSuchEntityException()));
 
-        $this->assertNull($this->model->getOverriddenValue());
+        $this->model->getOverriddenValue();
     }
 
     public function testGetOverriddenValueIsCustomerAndCartIsNull()

lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php

@@ -34,6 +34,7 @@ interface ParamOverriderInterface
      * Returns the overridden value to use.
      *
      * @return string|int|null
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getOverriddenValue();
 }