* Removed obsoletes from IConfigManipulator. * Removed obsolete models builder extensions. * Removed the obsolete ContentDashboardSettings. * Removed the obsolete InstallMissingDatabase setting on GlobalSettings. * Removed obsolete NuCache settings. * Removed obsolete RuntimeMinificationSettings. * Removed obsolete health check constant. * Removed obsolete icon constant. * Removed obsolete telemetry constant. * Removed obsolete property and constructor on UmbracoBuilder. * Removed obsolete constructor on AuditNotificationsHandler. * Removed obsolete constructor on HTTP header health checks. * Removed obsolete constructor on MediaFileManager. * Removed obsolete GetDefaultFileContent on ViewHelper. * Remove obsoleted methods on embed providers. * Fix tests. * Removed obsolete constructors on BlockEditorDataConverter. * Removed obsolete SeedCacheDuration property on CacheSettings. * Removed obsolete PublishCulture on ContentRepositoryExtensions. * Removed obsolete MonitorLock. * Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository. * Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository. * Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository. * Removed obsolete DateValueEditor constructors. * Removed obsolete GetAutomaticRelationTypesAliases. * Removed obsolete constructor on TextOnlyValueEditor. * Removed obsolete constructors on RegexValidator and RequiredValidator. * Removed obsolete constructs on SliderValueConverter and TagsValueConverter. * Removed obsolete GetContentType methods from IPublishedCache. * Removed ContentFinderByIdPath. * Removed obsolete constructor on DefaultMediaUrlProvider. * Removed obsolete constructor on Domain. * Removed obsolete constructor on PublishedRequest. * Removed obsolete methods on CheckPermissions. * Removed obsolete GetUserId from IBackOfficeSecurity. * Removed obsolete methods on LegacyPasswordSecurity. * Removed obsolete constructors on AuditService. * Removed obsolete methods on IContentEditingService. * Remove obsolete constructors and methods on ContentService/IContentService. * Removed obsolete constructor in ContentTypeEditingService. * Removed obsolete constructor in MediaTypeEditingService. * Removed obsolete constructor in MemberTypeEditingService. * Removed obsolete constructor in ContentTypeService. * Removed obsolete constructors in ContentTypeServiceBase. * Removed obsolete constructors and methods in ContentVersionService. * Removed obsolete constructor in DataTypeUsageService. * Removed obsolete constructor in DomainService. * Removed obsolete constructor in FileService. * Removes obsolete AttemptMove from IContentService. * Removes obsolete SetPreventCleanup from IContentVersionService. * Removes obsolete GetReferences from IDataTypeService. * Removed obsolete SetConsentLevel from IMetricsConsentService. * Removed obsolete methods from IPackageDataInstallation. * Removed obsolete methods from IPackagingService. * Removed obsolete methods on ITwoFactorLoginService. Removed obsolete ITemporaryMediaService. * Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService. * More obsolete constructors. * Removed obsoleted overloads on IPropertyValidationService. * Fixed build for tests. * Removed obsolete constructor for PublicAccessService, UserService and RelationService. * Removed GetDefaultMemberType. * Removed obsolete user group functionality from IUserService. * Removed obsolete extension methods on IUserService. * Removed obsolete method from ITelemetryService. * Removed obsolete UdiParserServiceConnectors. * Removed obsolete method on ICookieManager. * Removed obsolete DynamicContext. * Removed obsolete XmlHelper. * Fixed failing integration tests. * Removed obsoletes in Umbraco.Cms.Api.Common * Removed obsoletes in Umbraco.Cms.Api.Delivery * Removed obsoletes in Umbraco.Cms.Api.Management * Removed obsoletes in Umbraco.Examine.Lucene * Removed obsoletes in Umbraco.Infrastructure * Fix failing delivery API contract integration test. * Made integration tests internal. * Removed obsoletes from web projects. * Fix build. * Removed Twitter OEmbed provider * Removed obsolete constructor on PublishedDataType. * Removed obsolete constructors on PublishedCacheBase. * Removed the obsolete PropertyEditorTagsExtensions. * Removed obsoletion properties on configuration response models (#18697) * Removed obsolete methods from server-side models. * Update client-side types and sdk. * Update client-side files. * Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694) * Removed obsolete method in UserService. (#18710) * Removed obsoleted group alias keys from being publicly available. (#18682) * Removed unneceessary ApiVersion attribute. * Clean-up obsoletions on MemberService (#18703) * Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers. * Removed obsoletion on member service method that's not obsolete on the interface.
177 lines
7.9 KiB
C#
177 lines
7.9 KiB
C#
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)]
|
|
internal sealed 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);
|
|
}
|
|
}
|