Merge remote-tracking branch 'origin/MC-39642' into 2.4-develop-sidecar-pr13

Author: ysapiga

app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php

@@ -60,7 +60,8 @@ public function resolve(
                 ],
                 'taxes' => $this->getAppliedShippingTaxesDetails($order),
                 'discounts' => $this->getShippingDiscountDetails($order),
-            ]
+            ],
+            'model' => $order
         ];
     }
 

dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/TreeTest.php

@@ -3,35 +3,66 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Adminhtml\Category\Checkboxes;
 
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
+ * Checks category chooser block behaviour
+ *
+ * @see \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree
+ *
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  */
-class TreeTest extends \PHPUnit\Framework\TestCase
+class TreeTest extends TestCase
 {
-    /** @var \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree */
-    protected $block;
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var Tree */
+    private $block;
+
+    /** @var SerializerInterface */
+    private $json;
 
+    /** @var DefaultCategory */
+    private $defaultCategoryHelper;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        $this->block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Tree::class);
+        $this->json = $this->objectManager->get(SerializerInterface::class);
+        $this->defaultCategoryHelper = $this->objectManager->get(DefaultCategory::class);
     }
 
-    public function testSetGetCategoryIds()
+    /**
+     * @return void
+     */
+    public function testSetGetCategoryIds(): void
     {
         $this->block->setCategoryIds([1, 4, 7, 56, 2]);
         $this->assertEquals([1, 4, 7, 56, 2], $this->block->getCategoryIds());
     }
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/categories.php
+     *
+     * @return void
      */
-    public function testGetTreeJson()
+    public function testGetTreeJson(): void
     {
         $jsonTree = $this->block->getTreeJson();
         $this->assertStringContainsString('Default Category (4)', $jsonTree);
@@ -45,4 +76,17 @@ public function testGetTreeJson()
         $this->assertStringContainsString('Category 12 (2)', $jsonTree);
         $this->assertStringMatchesFormat('%s"path":"1\/2\/%s\/%s\/%s"%s', $jsonTree);
     }
+
+    /**
+     * @return void
+     */
+    public function testGetTreeJsonWithSelectedCategory(): void
+    {
+        $this->block->setCategoryIds($this->defaultCategoryHelper->getId());
+        $result = $this->json->unserialize($this->block->getTreeJson());
+        $item = reset($result);
+        $this->assertNotEmpty($item);
+        $this->assertStringContainsString('Default Category', $item['text']);
+        $this->assertTrue($item['checked']);
+    }
 }