MC-16192: Fixes for unit test after merging mainline

Author: ffalkone

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -110,7 +110,12 @@ class StorageTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\Filesystem\Io\File|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $ioFile;
+    protected $ioFileMock;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $fileMock;
 
     private $allowedImageExtensions = [
         'jpg' => 'image/jpg',
@@ -153,8 +158,9 @@ protected function setUp()
             $this->returnValue($this->directoryMock)
         );
 
-        $this->ioFile = $this->createPartialMock(\Magento\Framework\Filesystem\Io\File::class, ['getPathInfo']);
-        $this->ioFile->expects(
+        $this->fileMock   = $this->createPartialMock(\Magento\Framework\Filesystem\Driver\File::class, ['getParentDirectory']);
+        $this->ioFileMock = $this->createPartialMock(\Magento\Framework\Filesystem\Io\File::class, ['getPathInfo']);
+        $this->ioFileMock->expects(
             $this->any()
         )->method(
             'getPathInfo'
@@ -247,7 +253,8 @@ function ($path) {
                     'include' => [],
                 ],
                 'data' => [],
-                'ioFile' => $this->ioFile
+                'file' => $this->fileMock,
+                'ioFile' => $this->ioFileMock
             ]
         );
     }
@@ -514,6 +521,8 @@ public function testUploadFile()
                 ]
             );
 
+        $this->fileMock->expects($this->any())->method('getParentDirectory')->willReturn($path);
+
         $image = $this->getMockBuilder(\Magento\Catalog\Model\Product\Image::class)
             ->disableOriginalConstructor()
             ->setMethods(['open', 'keepAspectRatio', 'resize', 'save'])