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

Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
This commit is contained in:
Benjamin Carleski
2020-02-11 11:43:54 -08:00
parent 9449ed9a4d 4309489174
commit bcd26b9243
34 changed files with 1059 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
View File

@@ -14,6 +14,7 @@ using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Web;
using Umbraco.Web.Templates;
using Umbraco.Web.Models;
namespace Umbraco.Tests.PublishedContent
{
@@ -60,7 +61,8 @@ namespace Umbraco.Tests.PublishedContent
pastedImages,
ShortStringHelper,
IOHelper,
LocalizedTextService)) { Id = 1 });
LocalizedTextService,
Mock.Of<IImageUrlGenerator>())) { Id = 1 });
var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeService);