From 8462c7efbb40b9aee35cfd6176895e08fad1972c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 29 Jun 2018 14:25:48 +0200
Subject: [PATCH] Fix tests

---
 src/Umbraco.Core/IO/MediaFileSystem.cs                | 3 ++-
 src/Umbraco.Tests/IO/FileSystemsTests.cs              | 2 ++
 src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs | 2 ++
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs          | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs
index ad37c1f8dc..f7f6e4c243 100644
--- a/src/Umbraco.Core/IO/MediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/MediaFileSystem.cs
@@ -30,7 +30,8 @@ namespace Umbraco.Core.IO
         {
             // due to how FileSystems is written at the moment, the ctor cannot be used to inject
             // dependencies, so we have to rely on property injection for anything we might need
-            Current.Container.InjectProperties(this);
+            Current.Container.InjectProperties(this);
+            MediaPathScheme.Initialize(this);
 
             UploadAutoFillProperties = new UploadAutoFillProperties(this, Logger, ContentConfig);
         }
diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs
index 79b1d8bf6c..49b8af6d18 100644
--- a/src/Umbraco.Tests/IO/FileSystemsTests.cs
+++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs
@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
+using Umbraco.Core.IO.MediaPathSchemes;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
@@ -32,6 +33,7 @@ namespace Umbraco.Tests.IO
             _container.Register<FileSystems>();
             _container.Register(_ => Mock.Of<IDataTypeService>());
             _container.Register(_ => Mock.Of<IContentSection>());
+            _container.RegisterSingleton<IMediaPathScheme, OriginalMediaPathScheme>();
 
             // make sure we start clean
             // because some tests will create corrupt or weird filesystems
diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
index 83d5fea1d1..9b5feb4415 100644
--- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
+++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
@@ -9,6 +9,7 @@ using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.IO.MediaPathSchemes;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
@@ -72,6 +73,7 @@ namespace Umbraco.Tests.PropertyEditors
 
                 container.Register<ILogger, PerContainerLifetime>(f => Mock.Of<ILogger>());
                 container.Register<IContentSection, PerContainerLifetime>(f => Mock.Of<IContentSection>());
+                container.RegisterSingleton<IMediaPathScheme, OriginalMediaPathScheme>();
                 var mediaFileSystem = new MediaFileSystem(Mock.Of<IFileSystem>());
 
                 var dataTypeService = new TestObjects.TestDataTypeService(
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index b5f3de72a4..3d284af7b7 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -15,6 +15,7 @@ using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
+using Umbraco.Core.IO.MediaPathSchemes;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.PublishedContent;
@@ -188,6 +189,8 @@ namespace Umbraco.Tests.Testing
 
             Container.RegisterCollectionBuilder<PropertyValueConverterCollectionBuilder>();
             Container.RegisterSingleton<IPublishedContentTypeFactory, PublishedContentTypeFactory>();
+
+            Container.RegisterSingleton<IMediaPathScheme, OriginalMediaPathScheme>();
         }
 
         protected virtual void ComposeCacheHelper()