* 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>
189 lines
7.5 KiB
C#
189 lines
7.5 KiB
C#
using Microsoft.Extensions.Logging;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.DeliveryApi;
|
|
using Umbraco.Cms.Core.Models.DeliveryApi;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Infrastructure.DeliveryApi;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.DeliveryApi;
|
|
|
|
[TestFixture]
|
|
public class ApiRichTextMarkupParserTests
|
|
{
|
|
private Mock<IApiContentRouteBuilder> _apiContentRouteBuilder;
|
|
private Mock<IApiMediaUrlProvider> _apiMediaUrlProvider;
|
|
|
|
[Test]
|
|
public void Can_Parse_Legacy_LocalLinks()
|
|
{
|
|
var key1 = Guid.Parse("a1c5d649977f4ea59b1cb26055f3eed3");
|
|
var data1 = new MockData()
|
|
.WithKey(key1)
|
|
.WithRoutePath("/inline/")
|
|
.WithRouteStartPath("inline");
|
|
|
|
var mockData = new Dictionary<Guid, MockData>
|
|
{
|
|
{ key1, data1 },
|
|
};
|
|
|
|
var parser = BuildDefaultSut(mockData);
|
|
|
|
var legacyHtml =
|
|
"<p><a href=\"/{localLink:umb://document/a1c5d649977f4ea59b1cb26055f3eed3}\" title=\"Inline\">link </a>to another page</p>";
|
|
|
|
var expectedOutput =
|
|
"<p><a href=\"/inline/\" title=\"Inline\" data-start-item-path=\"inline\" data-start-item-id=\"a1c5d649-977f-4ea5-9b1c-b26055f3eed3\">link </a>to another page</p>";
|
|
|
|
var parsedHtml = parser.Parse(legacyHtml);
|
|
|
|
Assert.AreEqual(expectedOutput, parsedHtml);
|
|
}
|
|
|
|
[Test]
|
|
public void Can_Parse_LocalLinks()
|
|
{
|
|
var key1 = Guid.Parse("eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f");
|
|
var data1 = new MockData()
|
|
.WithKey(key1)
|
|
.WithRoutePath("/self/")
|
|
.WithRouteStartPath("self");
|
|
|
|
var key2 = Guid.Parse("cc143afe-4cbf-46e5-b399-c9f451384373");
|
|
var data2 = new MockData()
|
|
.WithKey(key2)
|
|
.WithRoutePath("/other/")
|
|
.WithRouteStartPath("other");
|
|
|
|
var mockData = new Dictionary<Guid, MockData>
|
|
{
|
|
{ key1, data1 },
|
|
{ key2, data2 },
|
|
};
|
|
|
|
var parser = BuildDefaultSut(mockData);
|
|
|
|
var html =
|
|
@"<p>Rich text outside of the blocks with a link to <a type=""document"" href=""/{localLink:eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f}"" title=""itself"">itself</a><br><br></p>
|
|
<p>and to the <a type=""document"" href=""/{localLink:cc143afe-4cbf-46e5-b399-c9f451384373}"" title=""other page"">other page</a></p>";
|
|
|
|
var expectedOutput =
|
|
@"<p>Rich text outside of the blocks with a link to <a href=""/self/"" title=""itself"" data-start-item-path=""self"" data-start-item-id=""eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f"">itself</a><br><br></p>
|
|
<p>and to the <a href=""/other/"" title=""other page"" data-start-item-path=""other"" data-start-item-id=""cc143afe-4cbf-46e5-b399-c9f451384373"">other page</a></p>";
|
|
|
|
var parsedHtml = parser.Parse(html);
|
|
|
|
Assert.AreEqual(expectedOutput, parsedHtml);
|
|
}
|
|
|
|
[Test]
|
|
public void Can_Parse_Inline_LocalImages()
|
|
{
|
|
var key1 = Guid.Parse("395bdc0e8f4d4ad4af7f3a3f6265651e");
|
|
var data1 = new MockData()
|
|
.WithKey(key1)
|
|
.WithMediaUrl("https://localhost:44331/media/bdofwokn/77gtp8fbrxmgkefatp10aw.webp");
|
|
|
|
var mockData = new Dictionary<Guid, MockData>
|
|
{
|
|
{ key1, data1 },
|
|
};
|
|
var parser = BuildDefaultSut(mockData);
|
|
|
|
var legacyHtml =
|
|
@"<p>An image</p>\n<p><img src=""/media/bdofwokn/77gtp8fbrxmgkefatp10aw.webp?rmode=max&width=500&height=500"" alt="""" width=""500"" height=""500"" data-udi=""umb://media/395bdc0e8f4d4ad4af7f3a3f6265651e""></p>";
|
|
|
|
var expectedOutput =
|
|
@"<p>An image</p>\n<p><img src=""https://localhost:44331/media/bdofwokn/77gtp8fbrxmgkefatp10aw.webp?rmode=max&width=500&height=500"" alt="""" width=""500"" height=""500""></p>";
|
|
|
|
var parsedHtml = parser.Parse(legacyHtml);
|
|
|
|
Assert.AreEqual(expectedOutput, parsedHtml);
|
|
}
|
|
|
|
private ApiRichTextMarkupParser BuildDefaultSut(Dictionary<Guid, MockData> mockData)
|
|
{
|
|
var contentCacheMock = new Mock<IPublishedContentCache>();
|
|
|
|
contentCacheMock.Setup(cc => cc.GetById(It.IsAny<bool>(), It.IsAny<Guid>()))
|
|
.Returns<bool, Guid>((preview, key) => mockData[key].PublishedContent);
|
|
contentCacheMock.Setup(cc => cc.GetById(It.IsAny<Guid>()))
|
|
.Returns<Guid>(key => mockData[key].PublishedContent);
|
|
contentCacheMock.Setup(cc => cc.GetById(It.IsAny<bool>(), It.IsAny<Udi>()))
|
|
.Returns<bool, Udi>((preview, udi) => mockData[((GuidUdi)udi).Guid].PublishedContent);
|
|
contentCacheMock.Setup(cc => cc.GetById(It.IsAny<Udi>()))
|
|
.Returns<Udi>(udi => mockData[((GuidUdi)udi).Guid].PublishedContent);
|
|
|
|
var mediaCacheMock = new Mock<IPublishedMediaCache>();
|
|
mediaCacheMock.Setup(cc => cc.GetById(It.IsAny<bool>(), It.IsAny<Guid>()))
|
|
.Returns<bool, Guid>((preview, key) => mockData[key].PublishedContent);
|
|
mediaCacheMock.Setup(cc => cc.GetById(It.IsAny<Guid>()))
|
|
.Returns<Guid>(key => mockData[key].PublishedContent);
|
|
mediaCacheMock.Setup(cc => cc.GetById(It.IsAny<bool>(), It.IsAny<Udi>()))
|
|
.Returns<bool, Udi>((preview, udi) => mockData[((GuidUdi)udi).Guid].PublishedContent);
|
|
mediaCacheMock.Setup(cc => cc.GetById(It.IsAny<Udi>()))
|
|
.Returns<Udi>(udi => mockData[((GuidUdi)udi).Guid].PublishedContent);
|
|
|
|
_apiMediaUrlProvider = new Mock<IApiMediaUrlProvider>();
|
|
_apiMediaUrlProvider.Setup(mup => mup.GetUrl(It.IsAny<IPublishedContent>()))
|
|
.Returns<IPublishedContent>(ipc => mockData[ipc.Key].MediaUrl);
|
|
|
|
_apiContentRouteBuilder = new Mock<IApiContentRouteBuilder>();
|
|
_apiContentRouteBuilder.Setup(acrb => acrb.Build(It.IsAny<IPublishedContent>(), It.IsAny<string>()))
|
|
.Returns<IPublishedContent, string>((content, culture) => mockData[content.Key].ApiContentRoute);
|
|
|
|
return new ApiRichTextMarkupParser(
|
|
_apiContentRouteBuilder.Object,
|
|
_apiMediaUrlProvider.Object,
|
|
contentCacheMock.Object,
|
|
mediaCacheMock.Object,
|
|
Mock.Of<ILogger<ApiRichTextMarkupParser>>());
|
|
}
|
|
|
|
private class MockData
|
|
{
|
|
private Mock<IPublishedContent> _publishedContentMock = new Mock<IPublishedContent>();
|
|
private Mock<IApiContentRoute> _apiContentRouteMock = new Mock<IApiContentRoute>();
|
|
private Mock<IApiContentStartItem> _apiContentStartItem = new Mock<IApiContentStartItem>();
|
|
|
|
public IPublishedContent PublishedContent => _publishedContentMock.Object;
|
|
|
|
public IApiContentRoute ApiContentRoute => _apiContentRouteMock.Object;
|
|
|
|
public string MediaUrl { get; set; } = string.Empty;
|
|
|
|
public MockData()
|
|
{
|
|
_apiContentRouteMock.SetupGet(r => r.StartItem).Returns(_apiContentStartItem.Object);
|
|
}
|
|
|
|
public MockData WithKey(Guid key)
|
|
{
|
|
_publishedContentMock.SetupGet(i => i.Key).Returns(key);
|
|
_apiContentStartItem.SetupGet(rsi => rsi.Id).Returns(key);
|
|
return this;
|
|
}
|
|
|
|
public MockData WithRoutePath(string path)
|
|
{
|
|
_apiContentRouteMock.SetupGet(r => r.Path).Returns(path);
|
|
return this;
|
|
}
|
|
|
|
public MockData WithRouteStartPath(string path)
|
|
{
|
|
_apiContentStartItem.SetupGet(rsi => rsi.Path).Returns(path);
|
|
return this;
|
|
}
|
|
|
|
public MockData WithMediaUrl(string url)
|
|
{
|
|
MediaUrl = url;
|
|
return this;
|
|
}
|
|
}
|
|
}
|