Merge remote-tracking branch 'origin/BUG#AC-433' into spartans_pr_22062022

glo80326 · glo80326 · commit ab23c71c4141 · 2022-06-22T16:52:53.000+05:30
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -121,7 +121,7 @@ public function prepareActiveCartItems()
 
         $quoteItemsSelect->reset()
             ->from(['main_table' => $this->getTable('quote_item')], '')
-            ->columns('main_table.product_id')
+            ->columns(['main_table.product_id', 'main_table.name'])
             ->columns(['carts' => new \Zend_Db_Expr('COUNT(main_table.item_id)')])
             ->columns('quote.base_to_global_rate')
             ->joinInner(
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Product/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Product/GridTest.php
@@ -22,7 +22,6 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac
      */
     public function testGridContent()
     {
-        $this->markTestSkipped('MC-40448: Product\GridTest failure on 2.4-develop');
         /** @var \Magento\Framework\View\LayoutInterface $layout */
         $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
         /** @var Grid $grid */

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac`
`22`	`22`	`*/`
`23`	`23`	`public function testGridContent()`
`24`	`24`	`{`
`25`		`- $this->markTestSkipped('MC-40448: Product\GridTest failure on 2.4-develop');`
`26`	`25`	`/** @var \Magento\Framework\View\LayoutInterface $layout */`
`27`	`26`	`$layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);`
`28`	`27`	`/** @var Grid $grid */`