ACP2E-3998: [Cloud]Magento OOTB code - Email Template Setup issue

Author: aplapana

app/code/Magento/Email/Block/Adminhtml/Template/Edit.php

@@ -100,7 +100,7 @@ public function __construct(
         $this->_emailConfig = $emailConfig;
         $this->buttonList = $buttonList;
         $this->toolbar = $toolbar;
-        parent::__construct($context, $data);
+        parent::__construct($context, $data, $jsonHelper);
     }
 
     /**

app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php

@@ -8,12 +8,13 @@
 namespace Magento\Email\Test\Unit\Block\Adminhtml\Template;
 
 use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Button\ButtonList;
+use Magento\Backend\Block\Widget\Button\ToolbarInterface;
 use Magento\Backend\Model\Menu\Item\Factory;
 use Magento\Backend\Helper\Data;
 use Magento\Backend\Model\Menu;
 use Magento\Backend\Model\Menu\Config;
 use Magento\Backend\Model\Menu\Item;
-use Magento\Backend\Model\Url;
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\Structure\Element\Field;
 use Magento\Config\Model\Config\Structure\Element\Group;
@@ -23,8 +24,11 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
+use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\FileSystem as FilesystemView;
 use Magento\Framework\View\Layout;
 use Magento\Store\Model\StoreManagerInterface;
@@ -73,7 +77,6 @@ class EditTest extends TestCase
 
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
         $layoutMock = $this->getMockBuilder(Layout::class)
             ->addMethods(['helper'])
             ->disableOriginalConstructor()
@@ -90,7 +93,6 @@ protected function setUp(): void
                 ]
             )->getMock();
         $menuItemMock = $this->createMock(Item::class);
-        $urlBuilder = $this->createMock(Url::class);
         $this->_configStructureMock = $this->createMock(Structure::class);
         $this->_emailConfigMock = $this->createMock(\Magento\Email\Model\Template\Config::class);
 
@@ -114,21 +116,8 @@ protected function setUp(): void
         $this->context = $this->createMock(Context::class);
         $this->context->expects($this->any())->method('getStoreManager')
             ->willReturn($this->createMock(StoreManagerInterface::class));
-
-        $params = [
-            'urlBuilder' => $urlBuilder,
-            'layout' => $layoutMock,
-            'menuConfig' => $menuConfigMock,
-            'configStructure' => $this->_configStructureMock,
-            'emailConfig' => $this->_emailConfigMock,
-            'filesystem' => $this->filesystemMock,
-            'viewFileSystem' => $viewFilesystem,
-            'context' => $this->context
-        ];
-        $arguments = $objectManager->getConstructArguments(
-            Edit::class,
-            $params
-        );
+        $urlBuilder = $this->createMock(UrlInterface::class);
+        $this->context->expects($this->any())->method('getUrlBuilder')->willReturn($urlBuilder);
 
         $urlBuilder->expects($this->any())->method('getUrl')->willReturnArgument(0);
         $menuConfigMock->expects($this->any())->method('getMenu')->willReturn($menuMock);
@@ -137,7 +126,23 @@ protected function setUp(): void
 
         $layoutMock->expects($this->any())->method('helper')->willReturn($helperMock);
 
-        $this->_block = $objectManager->getObject(Edit::class, $arguments);
+        $encoder = $this->createMock(EncoderInterface::class);
+        $registry = $this->createMock(Registry::class);
+        $structure = $this->createMock(Structure::class);
+        $jsonHelper = $this->createMock(JsonHelper::class);
+        $buttonList = $this->createMock(ButtonList::class);
+        $toolbar = $this->createMock(ToolbarInterface::class);
+        $this->_block = new Edit(
+            $this->context,
+            $encoder,
+            $registry,
+            $menuConfigMock,
+            $structure,
+            $this->_emailConfigMock,
+            $jsonHelper,
+            $buttonList,
+            $toolbar
+        );
     }
 
     /**

app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php

@@ -213,7 +213,7 @@ public function testGetCacheKeyInfo(): void
             ->onlyMethods(['getCode'])
             ->getMock();
         $store->expects($this->once())->method('getCode')->willReturn('321');
-        $this->storeManager->expects($this->once())->method('getStore')->willReturn($store);
+        $this->storeManager->expects($this->exactly(2))->method('getStore')->willReturn($store);
 
         $this->assertEquals(
             ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null],

lib/internal/Magento/Framework/View/Test/Unit/Element/TemplateTest.php

@@ -130,7 +130,7 @@ protected function setUp(): void
 
     public function testGetTemplateFile()
     {
-        $params = ['module' => 'Fixture_Module', 'area' => 'frontend'];
+        $params = ['module' => 'Fixture_Module', 'area' => 'frontend', 'store_id' => null];
         $this->resolver->expects($this->once())->method('getTemplateFileName')->with('template.phtml', $params);
         $this->block->getTemplateFile();
     }