yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB3734-move-io-stuff

Browse Source 
# Conflicts:
#	src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
This commit is contained in:
Bjarke Berg
2019-11-19 07:55:05 +01:00
parent 4f204543e6 f10a3809ec
commit c9c4d3acdf
279 changed files with 1583 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
View File

@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Persistence.Repositories
base.SetUp();
_fileSystems = Mock.Of<IFileSystems>();
_fileSystem = new PhysicalFileSystem(Current.IOHelper, Current.Logger,new GlobalSettings().UmbracoCssPath);
_fileSystem = new PhysicalFileSystem(Current.IOHelper, Current.Logger, SettingsForTests.GenerateMockGlobalSettings().UmbracoCssPath);
Mock.Get(_fileSystems).Setup(x => x.StylesheetsFileSystem).Returns(_fileSystem);
var stream = CreateStream("body {background:#EE7600; color:#FFF;}");
_fileSystem.AddFile("styles.css", stream);