Merge remote-tracking branch 'origin/AC-10621' into AC-10821

Author: nishant04412

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php

@@ -20,7 +20,6 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -56,10 +55,6 @@ protected function setUp(): void
                 StoreManagerInterface::class,
                 $this->createMock(StoreManagerInterface::class)
             ],
-            [
-                Registry::class,
-                $this->createMock(Registry::class)
-            ],
             [
                 Config::class,
                 $this->createMock(Config::class)

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/EditTest.php

@@ -17,6 +17,7 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\View\Page\Title;
@@ -26,7 +27,6 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
-use Magento\Framework\Registry;
 use Magento\Cms\Model\Wysiwyg\Config;
 
 /**
@@ -124,14 +124,14 @@ protected function setUp(): void
                 Date::class,
                 $this->createMock(Date::class)
             ],
-            [
-                StoreManagerInterface::class,
-                $this->createMock(StoreManagerInterface::class)
-            ],
             [
                 Registry::class,
                 $this->createMock(Registry::class)
             ],
+            [
+                StoreManagerInterface::class,
+                $this->createMock(StoreManagerInterface::class)
+            ],
             [
                 Config::class,
                 $this->createMock(Config::class)