26117: "Current user does not have an active cart" even when he actually has one

engcom-Charlie · engcom-Charlie · commit afb752e629e9 · 2020-03-05T15:48:38.000+02:00
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -72,9 +72,7 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
         }
 
         if (false === (bool)$cart->getIsActive()) {
-            throw new GraphQlNoSuchEntityException(
-                __('Current user does not have an active cart.')
-            );
+            throw new GraphQlNoSuchEntityException(__('This cart isn\'t active.'));
         }
 
         if ((int)$cart->getStoreId() !== $storeId) {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -162,7 +162,7 @@ public function testGetNonExistentCart()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
      *
      * @expectedException Exception
-     * @expectedExceptionMessage Current user does not have an active cart.
+     * @expectedExceptionMessage This cart isn't active.
      */
     public function testGetInactiveCart()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
@@ -108,7 +108,7 @@ public function testMergeGuestWithCustomerCart()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Current user does not have an active cart.
+     * @expectedExceptionMessage This cart isn't active.
      */
     public function testGuestCartExpiryAfterMerge()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -119,7 +119,7 @@ public function testGetNonExistentCart()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
      *
      * @expectedException Exception
-     * @expectedExceptionMessage Current user does not have an active cart.
+     * @expectedExceptionMessage This cart isn't active.
      */
     public function testGetInactiveCart()
     {

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,7 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if (false === (bool)$cart->getIsActive()) {`
`75`		`- throw new GraphQlNoSuchEntityException(`
`76`		`- __('Current user does not have an active cart.')`
`77`		`- );`
	`75`	`+ throw new GraphQlNoSuchEntityException(__('This cart isn\'t active.'));`
`78`	`76`	`}`
`79`	`77`
`80`	`78`	`if ((int)$cart->getStoreId() !== $storeId) {`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function testGetNonExistentCart()`
`162`	`162`	`* @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php`
`163`	`163`	`*`
`164`	`164`	`* @expectedException Exception`
`165`		`- * @expectedExceptionMessage Current user does not have an active cart.`
	`165`	`+ * @expectedExceptionMessage This cart isn't active.`
`166`	`166`	`*/`
`167`	`167`	`public function testGetInactiveCart()`
`168`	`168`	`{`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function testMergeGuestWithCustomerCart()`
`108`	`108`	`* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php`
`109`	`109`	`* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php`
`110`	`110`	`* @expectedException \Exception`
`111`		`- * @expectedExceptionMessage Current user does not have an active cart.`
	`111`	`+ * @expectedExceptionMessage This cart isn't active.`
`112`	`112`	`*/`
`113`	`113`	`public function testGuestCartExpiryAfterMerge()`
`114`	`114`	`{`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function testGetNonExistentCart()`
`119`	`119`	`* @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php`
`120`	`120`	`*`
`121`	`121`	`* @expectedException Exception`
`122`		`- * @expectedExceptionMessage Current user does not have an active cart.`
	`122`	`+ * @expectedExceptionMessage This cart isn't active.`
`123`	`123`	`*/`
`124`	`124`	`public function testGetInactiveCart()`
`125`	`125`	`{`