* 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>
166 lines
6.6 KiB
C#
166 lines
6.6 KiB
C#
// using System.Collections.Generic;
|
|
// using System.Diagnostics;
|
|
// using System.Linq;
|
|
// using System.Threading.Tasks;
|
|
// using Microsoft.Extensions.Logging;
|
|
// using Moq;
|
|
// using NUnit.Framework;
|
|
// using Umbraco.Cms.Core.Routing;
|
|
// using Umbraco.Cms.Infrastructure.PublishedCache;
|
|
// using Umbraco.Cms.Tests.Common.Published;
|
|
// using Umbraco.Cms.Tests.UnitTests.TestHelpers;
|
|
// using Umbraco.Extensions;
|
|
//
|
|
// namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
|
|
//
|
|
// FIXME: Reintroduce if relevant
|
|
// [TestFixture]
|
|
// public class ContentFinderByUrlTests : PublishedSnapshotServiceTestBase
|
|
// {
|
|
// private async Task<(ContentFinderByUrl finder, IPublishedRequestBuilder frequest)> GetContentFinder(
|
|
// string urlString)
|
|
// {
|
|
// var xml = PublishedContentXml.BaseWebTestXml(1234);
|
|
//
|
|
// IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
|
|
// xml,
|
|
// TestHelper.ShortStringHelper,
|
|
// out var contentTypes,
|
|
// out var dataTypes).ToList();
|
|
//
|
|
// InitializedCache(kits, contentTypes, dataTypes);
|
|
//
|
|
// var umbracoContextAccessor = GetUmbracoContextAccessor(urlString);
|
|
// var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
|
|
// var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
|
|
// var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
|
|
// var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
|
|
// return (lookup, frequest);
|
|
// }
|
|
//
|
|
// [TestCase("/", 1046)]
|
|
// [TestCase("/Sub1", 1173)]
|
|
// [TestCase("/sub1", 1173)]
|
|
// [TestCase("/home/sub1", -1)] // should fail
|
|
//
|
|
// // these two are special. getNiceUrl(1046) returns "/" but getNiceUrl(1172) cannot also return "/" so
|
|
// // we've made it return "/test-page" => we have to support that URL back in the lookup...
|
|
// [TestCase("/home", 1046)]
|
|
// [TestCase("/test-page", 1172)]
|
|
// public async Task Match_Document_By_Url_Hide_Top_Level(string urlString, int expectedId)
|
|
// {
|
|
// GlobalSettings.HideTopLevelNodeFromPath = true;
|
|
//
|
|
// var (finder, frequest) = await GetContentFinder(urlString);
|
|
//
|
|
// Assert.IsTrue(GlobalSettings.HideTopLevelNodeFromPath);
|
|
//
|
|
// // TODO: debugging - going further down, the routes cache is NOT empty?!
|
|
// if (urlString == "/home/sub1")
|
|
// {
|
|
// Debugger.Break();
|
|
// }
|
|
//
|
|
// var result = await finder.TryFindContent(frequest);
|
|
//
|
|
// if (expectedId > 0)
|
|
// {
|
|
// Assert.IsTrue(result);
|
|
// Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
|
|
// }
|
|
// else
|
|
// {
|
|
// Assert.IsFalse(result);
|
|
// }
|
|
// }
|
|
//
|
|
// [TestCase("/", 1046)]
|
|
// [TestCase("/home", 1046)]
|
|
// [TestCase("/home/Sub1", 1173)]
|
|
// [TestCase("/Home/Sub1", 1173)] // different cases
|
|
// public async Task Match_Document_By_Url(string urlString, int expectedId)
|
|
// {
|
|
// GlobalSettings.HideTopLevelNodeFromPath = false;
|
|
//
|
|
// var (finder, frequest) = await GetContentFinder(urlString);
|
|
//
|
|
// Assert.IsFalse(GlobalSettings.HideTopLevelNodeFromPath);
|
|
//
|
|
// var result = await finder.TryFindContent(frequest);
|
|
//
|
|
// Assert.IsTrue(result);
|
|
// Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
|
|
// }
|
|
//
|
|
// /// <summary>
|
|
// /// This test handles requests with special characters in the URL.
|
|
// /// </summary>
|
|
// /// <param name="urlString"></param>
|
|
// /// <param name="expectedId"></param>
|
|
// [TestCase("/", 1046)]
|
|
// [TestCase("/home/sub1/custom-sub-3-with-accént-character", 1179)]
|
|
// [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)]
|
|
// public async Task Match_Document_By_Url_With_Special_Characters(string urlString, int expectedId)
|
|
// {
|
|
// GlobalSettings.HideTopLevelNodeFromPath = false;
|
|
//
|
|
// var (finder, frequest) = await GetContentFinder(urlString);
|
|
//
|
|
// var result = await finder.TryFindContent(frequest);
|
|
//
|
|
// Assert.IsTrue(result);
|
|
// Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
|
|
// }
|
|
//
|
|
// /// <summary>
|
|
// /// This test handles requests with a hostname associated.
|
|
// /// The logic for handling this goes through the DomainHelper and is a bit different
|
|
// /// from what happens in a normal request - so it has a separate test with a mocked
|
|
// /// hostname added.
|
|
// /// </summary>
|
|
// /// <param name="urlString"></param>
|
|
// /// <param name="expectedId"></param>
|
|
// [TestCase("/", 1046)]
|
|
// [TestCase("/home/sub1/custom-sub-3-with-accént-character", 1179)]
|
|
// [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)]
|
|
// public async Task Match_Document_By_Url_With_Special_Characters_Using_Hostname(string urlString, int expectedId)
|
|
// {
|
|
// GlobalSettings.HideTopLevelNodeFromPath = false;
|
|
//
|
|
// var (finder, frequest) = await GetContentFinder(urlString);
|
|
//
|
|
// frequest.SetDomain(new DomainAndUri(new Domain(1, "mysite", -1, "en-US", false, 0), new Uri("http://mysite/")));
|
|
//
|
|
// var result = await finder.TryFindContent(frequest);
|
|
//
|
|
// Assert.IsTrue(result);
|
|
// Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
|
|
// }
|
|
//
|
|
// /// <summary>
|
|
// /// This test handles requests with a hostname with special characters associated.
|
|
// /// The logic for handling this goes through the DomainHelper and is a bit different
|
|
// /// from what happens in a normal request - so it has a separate test with a mocked
|
|
// /// hostname added.
|
|
// /// </summary>
|
|
// /// <param name="urlString"></param>
|
|
// /// <param name="expectedId"></param>
|
|
// [TestCase("/æøå/", 1046)]
|
|
// [TestCase("/æøå/home/sub1", 1173)]
|
|
// [TestCase("/æøå/home/sub1/custom-sub-3-with-accént-character", 1179)]
|
|
// [TestCase("/æøå/home/sub1/custom-sub-4-with-æøå", 1180)]
|
|
// public async Task Match_Document_By_Url_With_Special_Characters_In_Hostname(string urlString, int expectedId)
|
|
// {
|
|
// GlobalSettings.HideTopLevelNodeFromPath = false;
|
|
//
|
|
// var (finder, frequest) = await GetContentFinder(urlString);
|
|
//
|
|
// frequest.SetDomain(new DomainAndUri(new Domain(1, "mysite/æøå", -1, "en-US", false, 0), new Uri("http://mysite/æøå")));
|
|
//
|
|
// var result = await finder.TryFindContent(frequest);
|
|
//
|
|
// Assert.IsTrue(result);
|
|
// Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
|
|
// }
|
|
// }
|