Resolved test failures

Author: Graham Wharton

app/code/Magento/Email/Model/AbstractTemplate.php

@@ -215,7 +215,8 @@ public function __construct(
         $this->templateFactory = $templateFactory;
         $this->filterManager = $filterManager;
         $this->urlModel = $urlModel;
-        $this->fileStorageDatabase = $fileStorageDatabase ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Database::class);
+        $this->fileStorageDatabase = $fileStorageDatabase ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(Database::class);
         parent::__construct($context, $registry, null, null, $data);
     }
 

app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php

@@ -48,6 +48,11 @@ class BackendTemplateTest extends \PHPUnit\Framework\TestCase
      */
     private $serializerMock;
 
+    /**
+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $databaseHelperMock;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -58,14 +63,25 @@ protected function setUp()
         $this->structureMock = $this->createMock(\Magento\Config\Model\Config\Structure::class);
         $this->structureMock->expects($this->any())->method('getFieldPathsByAttribute')->willReturn(['path' => 'test']);
 
+        $this->databaseHelperMock = $this->createMock(\Magento\MediaStorage\Helper\File\Storage\Database::class);
         $this->resourceModelMock = $this->createMock(\Magento\Email\Model\ResourceModel\Template::class);
         $this->resourceModelMock->expects($this->any())->method('getSystemConfigByPathsAndTemplateId')->willReturn(['test_config' => 2015]);
         /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManagerMock*/
         $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
         $objectManagerMock->expects($this->any())
             ->method('get')
-            ->with(\Magento\Email\Model\ResourceModel\Template::class)
-            ->will($this->returnValue($this->resourceModelMock));
+            ->willReturnCallback(
+                function ($value) {
+                    switch($value) {
+                        case \Magento\MediaStorage\Helper\File\Storage\Database::class:
+                            return ($this->databaseHelperMock);
+                        case \Magento\Email\Model\ResourceModel\Template::class:
+                            return ($this->resourceModelMock);
+                        default:
+                            return(NULL);
+                    }
+                }
+            );
 
         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
 

app/code/Magento/Email/composer.json

@@ -9,6 +9,7 @@
         "magento/module-cms": "102.0.*",
         "magento/module-backend": "100.2.*",
         "magento/module-variable": "100.2.*",
+        "magento/module-media-storage": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "suggest": {