* Remove nucache reference from Web.Common * Get tests building-ish * Move ReservedFieldNamesService to the right project * Remove IPublishedSnapshotStatus * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Remove IPublishedSnapshot from UmbracoContext * Begin removing usage of IPublishedSnapshot from PublishedContentExtensions * Fix PublishedContentExtensions.cs * Don't use snapshots in delivery media api * Use IPublishedMediaCache in QueryMediaApiController * Remove more usages of IPublishedSnapshotAccessor * Comment out tests * Remove more usages of PublishedSnapshotAccessor * Remove PublishedSnapshot from property * Fixed test build * Fix errors * Fix some tests * Delete NuCache 🎉 * Implement DatabaseCacheRebuilder * Remove usage of IPublishedSnapshotService * Remove IPublishedSnapshotService * Remove TestPublishedSnapshotAccessor and make tests build * Don't test Snapshot cachelevel It's no longer supported * Fix BlockEditorConverter Element != Element document type * Remember to set cachemanager * Fix RichTextParserTests * Implement TryGetLevel on INavigationQueryService * Fake level and obsolete it in PublishedContent * Remove ChildrenForAllCultures * Hack Path property on PublishedContent * Remove usages of IPublishedSnapshot in tests * More ConvertersTests * Add hybrid cache to integration tests We can actually do this now because we no longer save files on disk * Rename IPublishedSnapshotRebuilder to ICacheRebuilder * Comment out tests * V15: Replacing the usages of Parent (navigation data) from IPublishedContent (#17125) * Fix .Parent references in PublishedContentExtensions * Add missing methods to FriendlyPublishedContentExtensions (ones that you were able to call on the content directly as they now require extra params) * Fix references from the extension methods * Fix dependencies in tests * Replace IPublishedSnapshotAccessor with the content cache in tests * Resolving more .Parent references * Fix unit tests * Obsolete and use extension methods * Remove private method and use extension instead * Moving code around * Fix tests * Fix more references * Cleanup * Fix more usages * Resolve merge conflict * Fix tests * Cleanup * Fix more tests * Fixed unit tests * Cleanup * Replace last usages --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> * Remove usage of IPublishedSnapshotAccessor from IRequestItemProvider * Post merge fixup * Remo IPublishedSnapshot * Add HasAny to IDocumentUrlService * Fix TextBuilder * Fix modelsbuilder tests * Use explicit types * Implement GetByContentType * Support element types in PublishedContentTypeCache * Run enlistments before publishing notifications * Fix elements cache refreshing * Implement GetByUdi * Implement GetAtRoot * Implement GetByRoute * Reimplement GetRouteById * Fix blocks unit tests * Initialize domain cache on boot * Only return routes with domains on non default lanauges * V15: Replacing the usages of `Children` (navigation data) from `IPublishedContent` (#17159) * Update params in PublishedContentExtensions to the general interfaces for the published cache and navigation service, so that we can use the extension methods on both documents and media * Introduce GetParent() which uses the right services * Fix obsolete message on .Parent * Obsolete .Children * Fix usages of Children for ApiMediaQueryService * Fix usage in internal * Fix usages in views * Fix indentation * Fix issue with delete language * Update nuget pacakges * Clear elements cache when content is deleted instead of trying to update it * Reset publishedModelFactory * Fixed publishing --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: kjac <kja@umbraco.dk>
205 lines
8.2 KiB
C#
205 lines
8.2 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System.Diagnostics;
|
|
using System.Linq;
|
|
using Microsoft.Extensions.Options;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Routing;
|
|
using Umbraco.Cms.Core.Services.Navigation;
|
|
using Umbraco.Cms.Core.Templates;
|
|
using Umbraco.Cms.Tests.Common;
|
|
using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates;
|
|
|
|
[TestFixture]
|
|
public class HtmlImageSourceParserTests
|
|
{
|
|
[Test]
|
|
public void Returns_Udis_From_Data_Udi_Html_Attributes()
|
|
{
|
|
var input = @"<p>
|
|
<div>
|
|
<img src='/media/12312.jpg' data-udi='umb://media/D4B18427A1544721B09AC7692F35C264' />
|
|
</div>
|
|
</p><p><img src='/media/234234.jpg' data-udi=""umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"" /></p>";
|
|
|
|
var imageSourceParser = new HtmlImageSourceParser(Mock.Of<IPublishedUrlProvider>());
|
|
|
|
var result = imageSourceParser.FindUdisFromDataAttributes(input).ToList();
|
|
Assert.AreEqual(2, result.Count);
|
|
Assert.AreEqual(UdiParser.Parse("umb://media/D4B18427A1544721B09AC7692F35C264"), result[0]);
|
|
Assert.AreEqual(UdiParser.Parse("umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"), result[1]);
|
|
}
|
|
|
|
[Test]
|
|
public void Remove_Image_Sources()
|
|
{
|
|
var imageSourceParser = new HtmlImageSourceParser(Mock.Of<IPublishedUrlProvider>());
|
|
|
|
var result = imageSourceParser.RemoveImageSources(@"<p>
|
|
<div>
|
|
<img src=""/media/12354/test.jpg"" />
|
|
</div></p>
|
|
<p>
|
|
<div><img src=""/media/987645/test.jpg"" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
|
|
</p>");
|
|
|
|
Assert.AreEqual(
|
|
@"<p>
|
|
<div>
|
|
<img src=""/media/12354/test.jpg"" />
|
|
</div></p>
|
|
<p>
|
|
<div><img src="""" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
|
|
</p>",
|
|
result);
|
|
}
|
|
|
|
[Test]
|
|
public void Ensure_Image_Sources()
|
|
{
|
|
// setup a mock URL provider which we'll use for testing
|
|
var mediaType = new PublishedContentType(
|
|
Guid.NewGuid(),
|
|
777,
|
|
"image",
|
|
PublishedItemType.Media,
|
|
Enumerable.Empty<string>(),
|
|
Enumerable.Empty<PublishedPropertyType>(),
|
|
ContentVariation.Nothing);
|
|
var media = new Mock<IPublishedContent>();
|
|
media.Setup(x => x.ContentType).Returns(mediaType);
|
|
var mediaUrlProvider = new Mock<IMediaUrlProvider>();
|
|
mediaUrlProvider.Setup(x => x.GetMediaUrl(
|
|
It.IsAny<IPublishedContent>(),
|
|
It.IsAny<string>(),
|
|
It.IsAny<UrlMode>(),
|
|
It.IsAny<string>(),
|
|
It.IsAny<Uri>()))
|
|
.Returns(UrlInfo.Url("/media/1001/my-image.jpg"));
|
|
|
|
var umbracoContextAccessor = new TestUmbracoContextAccessor();
|
|
|
|
var umbracoContextFactory = TestUmbracoContextFactory.Create(
|
|
umbracoContextAccessor: umbracoContextAccessor);
|
|
|
|
var webRoutingSettings = new WebRoutingSettings();
|
|
var publishedUrlProvider = new UrlProvider(
|
|
umbracoContextAccessor,
|
|
Options.Create(webRoutingSettings),
|
|
new UrlProviderCollection(() => Enumerable.Empty<IUrlProvider>()),
|
|
new MediaUrlProviderCollection(() => new[] { mediaUrlProvider.Object }),
|
|
Mock.Of<IVariationContextAccessor>(),
|
|
Mock.Of<IPublishedContentCache>(),
|
|
Mock.Of<IDocumentNavigationQueryService>());
|
|
|
|
using (var reference = umbracoContextFactory.EnsureUmbracoContext())
|
|
{
|
|
var mediaCache = Mock.Get(reference.UmbracoContext.Media);
|
|
mediaCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(media.Object);
|
|
|
|
var imageSourceParser = new HtmlImageSourceParser(publishedUrlProvider);
|
|
|
|
var result = imageSourceParser.EnsureImageSources(@"<p>
|
|
<div>
|
|
<img src="""" />
|
|
</div></p>
|
|
<p>
|
|
<div><img src="""" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
|
|
</p>
|
|
<p>
|
|
<div><img src=""?width=100"" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
|
|
</p>");
|
|
|
|
Assert.AreEqual(
|
|
@"<p>
|
|
<div>
|
|
<img src="""" />
|
|
</div></p>
|
|
<p>
|
|
<div><img src=""/media/1001/my-image.jpg"" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
|
|
</p>
|
|
<p>
|
|
<div><img src=""/media/1001/my-image.jpg?width=100"" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
|
|
</p>",
|
|
result);
|
|
}
|
|
}
|
|
|
|
[TestCase(
|
|
@"<div><img src="""" /></div>",
|
|
ExpectedResult = @"<div><img src="""" /></div>",
|
|
TestName = "Empty source is not updated with no data-udi set")]
|
|
[TestCase(
|
|
@"<div><img src="""" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
TestName = "Empty source is updated with data-udi set")]
|
|
[TestCase(
|
|
@"<div><img src=""non empty src"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
TestName = "Filled source is overwritten with data-udi set")]
|
|
[TestCase(
|
|
@"<div><img src=""some src"" some-attribute data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4"" another-attribute/></div>",
|
|
ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" some-attribute data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4"" another-attribute/></div>",
|
|
TestName = "Attributes are persisted")]
|
|
[TestCase(
|
|
@"<div><img src=""somesrc?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
ExpectedResult = @"<div><img src=""/media/1001/image.jpg?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
TestName = "Source is trimmed and parameters are prefixed")]
|
|
[TestCase(
|
|
@"<div><img src=""?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
ExpectedResult = @"<div><img src=""/media/1001/image.jpg?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
|
|
TestName = "Parameters are prefixed")]
|
|
[TestCase(
|
|
@"<div>
|
|
<img src="""" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/>
|
|
<img src=""src"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD5""/>
|
|
<img src=""?asd"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD6""/>
|
|
</div>",
|
|
ExpectedResult =
|
|
@"<div>
|
|
<img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/>
|
|
<img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD5""/>
|
|
<img src=""/media/1001/image.jpg?asd"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD6""/>
|
|
</div>",
|
|
TestName = "Multiple img tags are handled")]
|
|
[Category("Ensure image sources")]
|
|
public string Ensure_ImageSources_Processing(string sourceHtml)
|
|
{
|
|
var fakeMediaUrl = "/media/1001/image.jpg";
|
|
var parser = new HtmlImageSourceParser(guid => fakeMediaUrl);
|
|
var actual = parser.EnsureImageSources(sourceHtml);
|
|
|
|
return actual;
|
|
}
|
|
|
|
[Category("Ensure image sources")]
|
|
[Test]
|
|
public void Ensure_Large_Html_Is_Processed_Quickly()
|
|
{
|
|
var symbolCount = 25000;
|
|
var maxMsToRun = 200;
|
|
|
|
var longText = new string('*', symbolCount);
|
|
var text = $@"<img src=""{longText}"" />";
|
|
|
|
var fakeMediaUrl = "/media/1001/image.jpg";
|
|
var parser = new HtmlImageSourceParser(guid => fakeMediaUrl);
|
|
|
|
var timer = new Stopwatch();
|
|
timer.Start();
|
|
parser.EnsureImageSources(text);
|
|
timer.Stop();
|
|
|
|
Assert.IsTrue(timer.ElapsedMilliseconds <= maxMsToRun);
|
|
}
|
|
}
|