Merge branch 'MC-21814-cart' of github.com:magento-honey-badgers/magento2ce into MC-21814-cart

dthampy · dthampy · commit 1506dd3bfe60 · 2019-11-01T13:18:35.000-05:00
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomerCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomerCart.php
@@ -29,7 +29,7 @@ class CustomerCart implements ResolverInterface
     /**
      * @var CartManagementInterface
      */
-    protected $cartManagement;
+    private $cartManagement;
 
     /**
      * @param CreateEmptyCartForCustomer $createEmptyCartForCustomer
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
@@ -190,7 +190,8 @@ public function testGetCartWithNotDefaultStore()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/Store/_files/second_store.php
      *
      * @expectedException Exception

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,8 @@ public function testGetCartWithNotDefaultStore()`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`/**`
`193`		`- * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php`
	`193`	`+ * @magentoApiDataFixture Magento/Customer/_files/customer.php`
	`194`	`+ * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php`
`194`	`195`	`* @magentoApiDataFixture Magento/Store/_files/second_store.php`
`195`	`196`	`*`
`196`	`197`	`* @expectedException Exception`