-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove RTE embedded image handling + clean up file upload configurati…
…on (#16025)
- Loading branch information
Showing
6 changed files
with
189 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
176 changes: 176 additions & 0 deletions
176
...sts.Integration/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImagesTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,176 @@ | ||
using System.Text; | ||
using HtmlAgilityPack; | ||
using Microsoft.Extensions.DependencyInjection; | ||
using Moq; | ||
using NUnit.Framework; | ||
using Umbraco.Cms.Core; | ||
using Umbraco.Cms.Core.Models.PublishedContent; | ||
using Umbraco.Cms.Core.Models.TemporaryFile; | ||
using Umbraco.Cms.Core.PropertyEditors; | ||
using Umbraco.Cms.Core.PublishedCache; | ||
using Umbraco.Cms.Core.Routing; | ||
using Umbraco.Cms.Core.Services; | ||
using Umbraco.Cms.Core.Web; | ||
using Umbraco.Cms.Tests.Common.Testing; | ||
using Umbraco.Cms.Tests.Integration.Testing; | ||
|
||
namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.PropertyEditors; | ||
|
||
[TestFixture] | ||
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)] | ||
public class RichTextEditorPastedImagesTests : UmbracoIntegrationTest | ||
{ | ||
private static readonly Guid GifFileKey = Guid.Parse("E625C7FA-6CA7-4A01-92CD-FB5C6F89973D"); | ||
|
||
private static readonly Guid SvgFileKey = Guid.Parse("0E3A7DFE-DF09-4C3B-881C-E1B815A4502F"); | ||
|
||
protected override void ConfigureTestServices(IServiceCollection services) | ||
{ | ||
// mock out the temporary file service so we don't have to read/write files from/to disk | ||
var temporaryFileServiceMock = new Mock<ITemporaryFileService>(); | ||
temporaryFileServiceMock | ||
.Setup(t => t.GetAsync(GifFileKey)) | ||
.Returns(Task.FromResult(new TemporaryFileModel | ||
{ | ||
AvailableUntil = DateTime.UtcNow.AddDays(1), | ||
FileName = "the-pixel.gif", | ||
Key = GifFileKey, | ||
OpenReadStream = () => new MemoryStream(Convert.FromBase64String("R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")) | ||
})); | ||
temporaryFileServiceMock | ||
.Setup(t => t.GetAsync(SvgFileKey)) | ||
.Returns(Task.FromResult(new TemporaryFileModel | ||
{ | ||
AvailableUntil = DateTime.UtcNow.AddDays(1), | ||
FileName = "the-vector.svg", | ||
Key = SvgFileKey, | ||
OpenReadStream = () => new MemoryStream(Encoding.UTF8.GetBytes(@"<svg viewBox=""0 0 70 74"" fill=""none"" xmlns=""http://www.w3.org/2000/svg""><rect width=""100%"" height=""100%"" fill=""black""/></svg>")) | ||
})); | ||
|
||
services.AddUnique<ITemporaryFileService>(temporaryFileServiceMock.Object); | ||
|
||
// the integration tests do not really play nice with published content, so we need to mock a fair bit in order to generate media URLs | ||
var publishedMediaTypeMock = new Mock<IPublishedContentType>(); | ||
publishedMediaTypeMock.SetupGet(c => c.ItemType).Returns(PublishedItemType.Media); | ||
|
||
var publishedMediaMock = new Mock<IPublishedContent>(); | ||
publishedMediaMock.SetupGet(m => m.ContentType).Returns(publishedMediaTypeMock.Object); | ||
|
||
var publishedMediaCacheMock = new Mock<IPublishedMediaCache>(); | ||
publishedMediaCacheMock.Setup(mc => mc.GetById(It.IsAny<Guid>())).Returns(publishedMediaMock.Object); | ||
|
||
var umbracoContextMock = new Mock<IUmbracoContext>(); | ||
umbracoContextMock.SetupGet(c => c.Media).Returns(publishedMediaCacheMock.Object); | ||
var umbracoContext = umbracoContextMock.Object; | ||
|
||
var umbracoContextAccessor = new Mock<IUmbracoContextAccessor>(); | ||
umbracoContextAccessor.Setup(ca => ca.TryGetUmbracoContext(out umbracoContext)).Returns(true); | ||
|
||
services.AddUnique<IUmbracoContextAccessor>(umbracoContextAccessor.Object); | ||
|
||
var publishedUrlProviderMock = new Mock<IPublishedUrlProvider>(); | ||
publishedUrlProviderMock | ||
.Setup(pu => pu.GetMediaUrl(It.IsAny<IPublishedContent>(), It.IsAny<UrlMode>(), It.IsAny<string?>(), It.IsAny<string>(), It.IsAny<Uri?>())) | ||
.Returns("the-media-url"); | ||
|
||
services.AddUnique<IPublishedUrlProvider>(publishedUrlProviderMock.Object); | ||
} | ||
|
||
[Test] | ||
public async Task Can_Handle_Temp_Gif_Image() | ||
{ | ||
var html = $"<p><img data-tmpimg=\"{GifFileKey:D}\"></p>"; | ||
var subject = Services.GetRequiredService<RichTextEditorPastedImages>(); | ||
|
||
var result = await subject.FindAndPersistPastedTempImagesAsync(html, Guid.Empty, Constants.Security.SuperUserKey); | ||
AssertContainsMedia(result, Constants.Conventions.MediaTypes.Image); | ||
} | ||
|
||
[Test] | ||
public async Task Can_Handle_Temp_Svg_Image() | ||
{ | ||
var html = $"<p><img data-tmpimg=\"{SvgFileKey:D}\"></p>"; | ||
var subject = Services.GetRequiredService<RichTextEditorPastedImages>(); | ||
|
||
var result = await subject.FindAndPersistPastedTempImagesAsync(html, Guid.Empty, Constants.Security.SuperUserKey); | ||
AssertContainsMedia(result, Constants.Conventions.MediaTypes.VectorGraphicsAlias); | ||
} | ||
|
||
[Test] | ||
public async Task Ignores_Non_Existing_Temp_Image() | ||
{ | ||
var key = Guid.NewGuid(); | ||
var html = $"<p><img data-tmpimg=\"{key:D}\"></p>"; | ||
var subject = Services.GetRequiredService<RichTextEditorPastedImages>(); | ||
|
||
var result = await subject.FindAndPersistPastedTempImagesAsync(html, Guid.Empty, Constants.Security.SuperUserKey); | ||
Assert.AreEqual(html, result); | ||
} | ||
|
||
[Test] | ||
public async Task Can_Handle_Multiple_Temp_Images() | ||
{ | ||
var html = $"<p><img data-tmpimg=\"{SvgFileKey:D}\"></p><p><img data-tmpimg=\"{GifFileKey:D}\"></p>"; | ||
var subject = Services.GetRequiredService<RichTextEditorPastedImages>(); | ||
|
||
var result = await subject.FindAndPersistPastedTempImagesAsync(html, Guid.Empty, Constants.Security.SuperUserKey); | ||
|
||
var htmlDoc = new HtmlDocument(); | ||
htmlDoc.LoadHtml(result); | ||
var imageNodes = htmlDoc.DocumentNode.SelectNodes("//img"); | ||
Assert.AreEqual(2, imageNodes.Count); | ||
|
||
var udis = imageNodes.Select(imageNode => UdiParser.Parse(imageNode.Attributes["data-udi"].Value)).OfType<GuidUdi>().ToArray(); | ||
Assert.AreEqual(2, udis.Length); | ||
Assert.AreNotEqual(udis.First().Guid, udis.Last().Guid); | ||
|
||
var mediaService = Services.GetRequiredService<IMediaService>(); | ||
Assert.Multiple(() => | ||
{ | ||
Assert.IsNotNull(mediaService.GetById(udis.First().Guid)); | ||
Assert.IsNotNull(mediaService.GetById(udis.Last().Guid)); | ||
}); | ||
} | ||
|
||
[Test] | ||
public async Task Does_Not_Create_Duplicates_Of_The_Same_Temp_Image() | ||
{ | ||
var html = $"<p><img data-tmpimg=\"{GifFileKey:D}\"></p><p><img data-tmpimg=\"{GifFileKey:D}\"></p>"; | ||
var subject = Services.GetRequiredService<RichTextEditorPastedImages>(); | ||
|
||
var result = await subject.FindAndPersistPastedTempImagesAsync(html, Guid.Empty, Constants.Security.SuperUserKey); | ||
|
||
var htmlDoc = new HtmlDocument(); | ||
htmlDoc.LoadHtml(result); | ||
var imageNodes = htmlDoc.DocumentNode.SelectNodes("//img"); | ||
Assert.AreEqual(2, imageNodes.Count); | ||
|
||
var udis = imageNodes.Select(imageNode => UdiParser.Parse(imageNode.Attributes["data-udi"].Value)).OfType<GuidUdi>().ToArray(); | ||
Assert.AreEqual(2, udis.Length); | ||
Assert.AreEqual(udis.First().Guid, udis.Last().Guid); | ||
|
||
var mediaService = Services.GetRequiredService<IMediaService>(); | ||
Assert.IsNotNull(mediaService.GetById(udis.First().Guid)); | ||
} | ||
|
||
private void AssertContainsMedia(string result, string expectedMediaTypeAlias) | ||
{ | ||
Assert.IsFalse(result.Contains("data-tmpimg")); | ||
|
||
var htmlDoc = new HtmlDocument(); | ||
htmlDoc.LoadHtml(result); | ||
var imageNode = htmlDoc.DocumentNode.SelectNodes("//img").FirstOrDefault(); | ||
Assert.IsNotNull(imageNode); | ||
|
||
Assert.IsTrue(imageNode.Attributes.Contains("src")); | ||
Assert.AreEqual("the-media-url", imageNode.Attributes["src"].Value); | ||
|
||
Assert.IsTrue(imageNode.Attributes.Contains("data-udi")); | ||
Assert.IsTrue(UdiParser.TryParse(imageNode.Attributes["data-udi"].Value, out GuidUdi udi)); | ||
Assert.AreEqual(Constants.UdiEntityType.Media, udi.EntityType); | ||
|
||
var media = Services.GetRequiredService<IMediaService>().GetById(udi.Guid); | ||
Assert.IsNotNull(media); | ||
Assert.AreEqual(expectedMediaTypeAlias, media.ContentType.Alias); | ||
} | ||
} |