* Update to dotnet 9 and update nuget packages * Update umbraco code version * Update Directory.Build.props Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> * Include preview version in pipeline * update template projects * update global json with specific version * Update version.json to v15 * Rename TrimStart and TrimEnd to string specific * Rename to Exact * Update global.json Co-authored-by: Ronald Barendse <ronald@barend.se> * Remove includePreviewVersion * Rename to trim exact * Add new Hybridcache project * Add tests * Start implementing PublishedContent.cs * Implement repository for content * Refactor to use async everywhere * Add cache refresher * make public as needed for serialization * Use content type cache to get content type out * Refactor to use ContentCacheNode model, that goes in the memory cache * Remove content node kit as its not needed * Implement tests for ensuring caching * Implement better asserts * Implement published property * Refactor to use mapping * Rename to document tests * Update to test properties * Create more tests * Refactor mock tests into own file * Update property test * Fix published version of content * Change default cache level to elements * Refactor to always have draft * Refactor to not use PublishedModelFactory * Added tests * Added and updated tests * Fixed tests * Don't return empty object with id * More tests * Added key * Another key * Refactor CacheService to be responsible for using the hybrid cache * Use notification handler to remove deleted content from cache * Add more tests for missing functions * Implement missing methods * Remove HasContent as it pertains to routing * Fik up test * formatting * refactor variable names * Implement variant tests * Map all the published content properties * Get item out of cache first, to assert updated * Implement member cache * Add member test * Implement media cache * Implement property tests for media tests * Refactor tests to use extension method * Add more media tests * Refactor properties to no longer have element caching * Don't use property cache level * Start implementing seeding * Only seed when main * Add Immutable for performance * Implement permanent seeding of content * Implement cache settings * Implement tests for seeding * Update package version * start refactoring nurepo * Refactor so draft & published nodes are cached individually * Refactor RefreshContent to take node instead of IContent * Refactor media to also use cache nodes * Remove member from repo as it isn't cached * Refactor media to not include preview, as media has no draft * create new benchmark project * POC Integration benchmarks with custom api controllers * Start implementing content picker tests * Implement domain cache * Rework content cache to implement interface * Start implementing elements cache * Implement published snapshot service * Publish snapshot tests * Use snapshot for elements cache * Create test proving we don't clear cache when updating content picker * Clear entire elements cache * Remove properties from element cache, when content gets updated. * Rename methods to async * Refactor to use old cache interfaces instead of new ones * Remove snapshot, as it is no longer needed * Fix tests building * Refactor domaincache to not have snapshots * Delete benchmarks * Delete benchmarks * Add HybridCacheProject to Umbraco * Add comment to route value transformer * Implement is draft * remove snapshot from property * V15 updated the hybrid caching integration tests to use ContentEditingService (#16947) * Added builder extension withParentKey * Created builder with ContentEditingService * Added usage of the ContentEditingService to SETUP * Started using ContentEditingService builder in tests * Updated builder extensions * Fixed builder * Clean up * Clean up, not done * Added Ids * Remove entries from cache on delete * Fix up seeding logic * Don't register hybrid cache twice * Change seeded entry options * Update hybrid cache package * Fix up published property to work with delivery api again * Fix dependency injection to work with tests * Fix naming * Dont make caches nullable * Make content node sealed * Remove path and other unused from content node * Remove hacky 2 phase ctor * Refactor to actually set content templates * Remove umbraco context * Remove "HasBy" methods * rename property data * Delete obsolete legacy stuff * Add todo for making expiration configurable * Add todo in UmbracoContext * Add clarifying comment in content factory * Remove xml stuff from published property * Fix according to review * Make content type cache injectible * Make content type cache injectible * Rename to database cache repository * Rename to document cache * Add TODO * Refactor to async * Rename to async * Make everything async * Remove duplicate line from json schema * Move Hybrid cache project * Remove leftover file * Refactor to use keys * Refactor published content to no longer have content data, as it is on the node itself * Refactor to member to use proper content node ctor * Move tests to own folder * Add immutable objects to property and content data for performance * Make property data public * Fix member caching to be singleton * Obsolete GetContentType * Remove todo * Fix naming * Fix lots of exposed errors due to scope test * Add final scope tests * Rename to document cache service * Rename test files * Create new doc type tests * Add ignore to tests * Start implementing refresh for content type save * Clear contenttype cache when contenttype is updated * Fix test Teh contenttype is not upated unless the property is dirty * Use init for ContentSourceDto * Fix get by key in PublishedContentTypeCache * Remove ContentType from PublishedContentTypeCache when contenttype is deleted * Update to preview 7 * Fix versions * Increase timeout for sqlite integration tests * Undo timeout increase * Try and undo init change to ContentSourceDto * That wasn't it chief * Try and make DomainAndUrlsTests non NonParallelizable * Update versions * Only run cache tests on linux for now --------- Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Ronald Barendse <ronald@barend.se> Co-authored-by: Andreas Zerbst <andr317c@live.dk> Co-authored-by: Sven Geusens <sge@umbraco.dk> Co-authored-by: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
212 lines
9.1 KiB
C#
212 lines
9.1 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
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.Routing;
|
|
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 HtmlLocalLinkParserTests
|
|
{
|
|
[Test]
|
|
public void Returns_Udis_From_LocalLinks()
|
|
{
|
|
var input = @"<p>
|
|
<div>
|
|
<img src='/media/12312.jpg' data-udi='umb://media/D4B18427A1544721B09AC7692F35C264' />
|
|
<a type=""document"" href=""/{localLink:eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f}"" title=""other page"">other page</a>
|
|
</div>
|
|
</p><p><img src='/media/234234.jpg' data-udi=""umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"" />
|
|
<a type=""media"" href=""/{localLink:7e21a725-b905-4c5f-86dc-8c41ec116e39}"" title=""media"">media</a>
|
|
</p>";
|
|
|
|
var parser = new HtmlLocalLinkParser(Mock.Of<IPublishedUrlProvider>());
|
|
|
|
var result = parser.FindUdisFromLocalLinks(input).ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(2, result.Count);
|
|
Assert.Contains(UdiParser.Parse("umb://document/eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f"), result);
|
|
Assert.Contains(UdiParser.Parse("umb://media/7e21a725-b905-4c5f-86dc-8c41ec116e39"), result);
|
|
});
|
|
}
|
|
|
|
// todo remove at some point and the implementation.
|
|
[Test]
|
|
public void Returns_Udis_From_Legacy_LocalLinks()
|
|
{
|
|
var input = @"<p>
|
|
<div>
|
|
<img src='/media/12312.jpg' data-udi='umb://media/D4B18427A1544721B09AC7692F35C264' />
|
|
<a href=""{locallink:umb://document/C093961595094900AAF9170DDE6AD442}"">hello</a>
|
|
</div>
|
|
</p><p><img src='/media/234234.jpg' data-udi=""umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"" />
|
|
<a href=""{locallink:umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2}"">hello</a>
|
|
</p>";
|
|
|
|
var parser = new HtmlLocalLinkParser(Mock.Of<IPublishedUrlProvider>());
|
|
|
|
var result = parser.FindUdisFromLocalLinks(input).ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(2, result.Count);
|
|
Assert.Contains(UdiParser.Parse("umb://document/C093961595094900AAF9170DDE6AD442"), result);
|
|
Assert.Contains(UdiParser.Parse("umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2"), result);
|
|
});
|
|
}
|
|
|
|
// todo remove at some point and the implementation.
|
|
[Test]
|
|
public void Returns_Udis_From_Legacy_And_Current_LocalLinks()
|
|
{
|
|
var input = @"<p>
|
|
<div>
|
|
<img src='/media/12312.jpg' data-udi='umb://media/D4B18427A1544721B09AC7692F35C264' />
|
|
<a href=""{locallink:umb://document/C093961595094900AAF9170DDE6AD442}"">hello</a>
|
|
</div>
|
|
</p><p><img src='/media/234234.jpg' data-udi=""umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"" />
|
|
<a href=""{locallink:umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2}"">hello</a>
|
|
</p>
|
|
<p>
|
|
<div>
|
|
<img src='/media/12312.jpg' data-udi='umb://media/D4B18427A1544721B09AC7692F35C264' />
|
|
<a type=""document"" href=""/{localLink:eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f}"" title=""other page"">other page</a>
|
|
</div>
|
|
</p><p><img src='/media/234234.jpg' data-udi=""umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"" />
|
|
<a type=""media"" href=""/{localLink:7e21a725-b905-4c5f-86dc-8c41ec116e39}"" title=""media"">media</a>
|
|
</p>";
|
|
|
|
var parser = new HtmlLocalLinkParser(Mock.Of<IPublishedUrlProvider>());
|
|
|
|
var result = parser.FindUdisFromLocalLinks(input).ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(4, result.Count);
|
|
Assert.Contains(UdiParser.Parse("umb://document/eed5fc6b-96fd-45a5-a0f1-b1adfb483c2f"), result);
|
|
Assert.Contains(UdiParser.Parse("umb://media/7e21a725-b905-4c5f-86dc-8c41ec116e39"), result);
|
|
Assert.Contains(UdiParser.Parse("umb://document/C093961595094900AAF9170DDE6AD442"), result);
|
|
Assert.Contains(UdiParser.Parse("umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2"), result);
|
|
});
|
|
}
|
|
|
|
[TestCase("", "")]
|
|
// current
|
|
[TestCase(
|
|
"<a type=\"document\" href=\"/{localLink:9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" title=\"world\">world</a>",
|
|
"<a href=\"/my-test-url\" title=\"world\">world</a>")]
|
|
[TestCase(
|
|
"<a type=\"media\" href=\"/{localLink:9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" title=\"world\">world</a>",
|
|
"<a href=\"/media/1001/my-image.jpg\" title=\"world\">world</a>")]
|
|
[TestCase(
|
|
"<a href=\"/{localLink:9931BDE0-AAC3-4BAB-B838-909A7B47570E}\"type=\"document\" title=\"world\">world</a>",
|
|
"<a href=\"/my-test-url\" title=\"world\">world</a>")]
|
|
[TestCase(
|
|
"<a href=\"/{localLink:9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" title=\"world\"type=\"media\">world</a>",
|
|
"<a href=\"/media/1001/my-image.jpg\" title=\"world\">world</a>")]
|
|
// legacy
|
|
[TestCase(
|
|
"hello href=\"{localLink:1234}\" world ",
|
|
"hello href=\"/my-test-url\" world ")]
|
|
[TestCase(
|
|
"hello href=\"{localLink:umb://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ",
|
|
"hello href=\"/my-test-url\" world ")]
|
|
[TestCase(
|
|
"hello href=\"{localLink:umb://document/9931BDE0AAC34BABB838909A7B47570E}\" world ",
|
|
"hello href=\"/my-test-url\" world ")]
|
|
[TestCase(
|
|
"hello href=\"{localLink:umb://media/9931BDE0AAC34BABB838909A7B47570E}\" world ",
|
|
"hello href=\"/media/1001/my-image.jpg\" world ")]
|
|
|
|
// This one has an invalid char so won't match.
|
|
[TestCase(
|
|
"hello href=\"{localLink:umb^://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ",
|
|
"hello href=\"{localLink:umb^://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ")]
|
|
[TestCase(
|
|
"hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ",
|
|
"hello href=\"#\" world ")]
|
|
public void ParseLocalLinks(string input, string result)
|
|
{
|
|
// setup a mock URL provider which we'll use for testing
|
|
var contentUrlProvider = new Mock<IUrlProvider>();
|
|
contentUrlProvider
|
|
.Setup(x => x.GetUrl(
|
|
It.IsAny<IPublishedContent>(),
|
|
It.IsAny<UrlMode>(),
|
|
It.IsAny<string>(),
|
|
It.IsAny<Uri>()))
|
|
.Returns(UrlInfo.Url("/my-test-url"));
|
|
var contentType = new PublishedContentType(
|
|
Guid.NewGuid(),
|
|
666,
|
|
"alias",
|
|
PublishedItemType.Content,
|
|
Enumerable.Empty<string>(),
|
|
Enumerable.Empty<PublishedPropertyType>(),
|
|
ContentVariation.Nothing);
|
|
var publishedContent = new Mock<IPublishedContent>();
|
|
publishedContent.Setup(x => x.Id).Returns(1234);
|
|
publishedContent.Setup(x => x.ContentType).Returns(contentType);
|
|
|
|
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(() => new[] { contentUrlProvider.Object }),
|
|
new MediaUrlProviderCollection(() => new[] { mediaUrlProvider.Object }),
|
|
Mock.Of<IVariationContextAccessor>());
|
|
using (var reference = umbracoContextFactory.EnsureUmbracoContext())
|
|
{
|
|
var contentCache = Mock.Get(reference.UmbracoContext.Content);
|
|
contentCache.Setup(x => x.GetById(It.IsAny<int>())).Returns(publishedContent.Object);
|
|
contentCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(publishedContent.Object);
|
|
|
|
var mediaCache = Mock.Get(reference.UmbracoContext.Media);
|
|
mediaCache.Setup(x => x.GetById(It.IsAny<int>())).Returns(media.Object);
|
|
mediaCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(media.Object);
|
|
|
|
var linkParser = new HtmlLocalLinkParser(publishedUrlProvider);
|
|
|
|
var output = linkParser.EnsureInternalLinks(input);
|
|
|
|
Assert.AreEqual(result, output);
|
|
}
|
|
}
|
|
}
|