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

Merge remote-tracking branch 'origin/v8/dev' into v9/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
#	src/Umbraco.Core/PropertyEditors/MediaPickerWithCropsValueConverter.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfiguration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfig.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3Configuration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3ConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
#	src/Umbraco.Tests/Composing/TypeLoaderTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
This commit is contained in:
Bjarke Berg
2021-05-11 10:14:57 +02:00
parent 2eb84f7d00 f1e2ef89d1
commit fe36c80ba0
105 changed files with 4107 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
View File

@@ -4,10 +4,9 @@ using System.Xml;
using System.Xml.Linq;
using System.Xml.XPath;
using Microsoft.Extensions.DependencyInjection;
using Examine;
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Models.PublishedContent;
@@ -21,9 +20,9 @@ using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Extensions;
using Umbraco.Tests.LegacyXmlPublishedCache;
using Umbraco.Tests.TestHelpers.Entities;
using Umbraco.Tests.Testing;
using Umbraco.Tests.UmbracoExamine;
namespace Umbraco.Tests.PublishedContent
{
/// <summary>
@@ -93,6 +92,7 @@ namespace Umbraco.Tests.PublishedContent
Name = "Rich Text",
DataTypeId = -87 //tiny mce
});
var existing = ServiceContext.MediaTypeService.GetAll();
ServiceContext.MediaTypeService.Save(mType);
var media = MockedMedia.CreateMediaImage(mType, -1);
media.Properties["content"].SetValue("<div>This is some content</div>");

8
src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
View File

@@ -365,13 +365,13 @@ namespace Umbraco.Tests.TestHelpers.Entities
return contentType;
}
public static MediaType CreateVideoMediaType()
public static MediaType CreateNewMediaType()
{
var mediaType = new MediaType(ShortStringHelper, -1)
{
Alias = "video",
Name = "Video",
Description = "ContentType used for videos",
Alias = "newMediaType",
Name = "New Media Type",
Description = "ContentType used for a new format",
Icon = ".sprTreeDoc3",
Thumbnail = "doc.png",
SortOrder = 1,