1258962429
* 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>
242 lines
16 KiB
C#
242 lines
16 KiB
C#
// using System.Linq;
|
|
// using System.Threading.Tasks;
|
|
// using Microsoft.Extensions.Logging;
|
|
// using Microsoft.Extensions.Options;
|
|
// using Moq;
|
|
// using NUnit.Framework;
|
|
// using Umbraco.Cms.Core.Cache;
|
|
// using Umbraco.Cms.Core.Configuration.Models;
|
|
// using Umbraco.Cms.Core.Hosting;
|
|
// using Umbraco.Cms.Core.Models;
|
|
// using Umbraco.Cms.Core.Models.PublishedContent;
|
|
// using Umbraco.Cms.Core.Routing;
|
|
// using Umbraco.Cms.Core.Services;
|
|
// using Umbraco.Cms.Core.Web;
|
|
// using Umbraco.Cms.Tests.Common;
|
|
// using Umbraco.Extensions;
|
|
//
|
|
// namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
|
|
//
|
|
// FIXME: Reintroduce if relevant
|
|
// [TestFixture]
|
|
// public class UrlsWithNestedDomains : UrlRoutingTestBase
|
|
// {
|
|
// // in the case of nested domains more than 1 URL may resolve to a document
|
|
// // but only one route can be cached - the 'canonical' route ie the route
|
|
// // using the closest domain to the node - here we test that if we request
|
|
// // a non-canonical route, it is not cached / the cache is not polluted
|
|
// [Test]
|
|
// public async Task DoNotPolluteCache()
|
|
// {
|
|
// var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
|
|
// GlobalSettings.HideTopLevelNodeFromPath = false;
|
|
//
|
|
// SetDomains1();
|
|
//
|
|
// const string url = "http://domain1.com/1001-1/1001-1-1";
|
|
//
|
|
// // get the nice URL for 100111
|
|
// var umbracoContextAccessor = GetUmbracoContextAccessor(url);
|
|
// var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
|
|
//
|
|
// var urlProvider = new DefaultUrlProvider(
|
|
// Mock.Of<IOptionsMonitor<RequestHandlerSettings>>(x => x.CurrentValue == requestHandlerSettings),
|
|
// Mock.Of<ILogger<DefaultUrlProvider>>(),
|
|
// new SiteDomainMapper(),
|
|
// umbracoContextAccessor,
|
|
// new UriUtility(Mock.Of<IHostingEnvironment>()),
|
|
// Mock.Of<ILocalizationService>());
|
|
// var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
|
|
//
|
|
// var absUrl = publishedUrlProvider.GetUrl(100111, UrlMode.Absolute);
|
|
// Assert.AreEqual("http://domain2.com/1001-1-1/", absUrl);
|
|
//
|
|
// const string cacheKeyPrefix = "NuCache.ContentCache.RouteByContent";
|
|
//
|
|
// // check that the proper route has been cached
|
|
// var cache = (FastDictionaryAppCache)umbracoContext.PublishedSnapshot.ElementsCache;
|
|
//
|
|
// var cacheKey = $"{cacheKeyPrefix}[P:100111]";
|
|
// Assert.AreEqual("10011/1001-1-1", cache.Get(cacheKey));
|
|
//
|
|
// // route a rogue URL
|
|
// var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
|
|
// var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
|
|
//
|
|
// publishedRouter.FindAndSetDomain(frequest);
|
|
// Assert.IsTrue(frequest.HasDomain());
|
|
//
|
|
// // check that it's been routed
|
|
// var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
|
|
// var result = await lookup.TryFindContent(frequest);
|
|
// Assert.IsTrue(result);
|
|
// Assert.AreEqual(100111, frequest.PublishedContent.Id);
|
|
//
|
|
// // has the cache been polluted?
|
|
// Assert.AreEqual("10011/1001-1-1", cache.Get(cacheKey)); // no
|
|
//
|
|
// // what's the nice URL now?
|
|
// Assert.AreEqual("http://domain2.com/1001-1-1/", publishedUrlProvider.GetUrl(100111)); // good
|
|
// }
|
|
//
|
|
// private void SetDomains1()
|
|
// {
|
|
// var domainService = Mock.Get(DomainService);
|
|
//
|
|
// domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
|
|
// .Returns((bool incWildcards) => new[]
|
|
// {
|
|
// new UmbracoDomain("http://domain1.com/")
|
|
// {
|
|
// Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US",
|
|
// },
|
|
// new UmbracoDomain("http://domain2.com/")
|
|
// {
|
|
// Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
|
|
// },
|
|
// });
|
|
// }
|
|
//
|
|
// private IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext, DefaultUrlProvider urlProvider)
|
|
// {
|
|
// var webRoutingSettings = new WebRoutingSettings();
|
|
// return new UrlProvider(
|
|
// new TestUmbracoContextAccessor(umbracoContext),
|
|
// Options.Create(webRoutingSettings),
|
|
// new UrlProviderCollection(() => new[] { urlProvider }),
|
|
// new MediaUrlProviderCollection(() => Enumerable.Empty<IMediaUrlProvider>()),
|
|
// Mock.Of<IVariationContextAccessor>());
|
|
// }
|
|
//
|
|
// protected override string GetXmlContent(int templateId)
|
|
// => @"<?xml version=""1.0"" encoding=""utf-8""?>
|
|
// <!DOCTYPE root[
|
|
// <!ELEMENT Doc ANY>
|
|
// <!ATTLIST Doc id ID #REQUIRED>
|
|
// ]>
|
|
// <root id=""-1"">
|
|
// <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
|
|
// <content><![CDATA[<div>This is some content</div>]]></content>
|
|
// <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// </Doc>
|
|
// </Doc>
|
|
// <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
|
|
// <content><![CDATA[<div>This is some content</div>]]></content>
|
|
// <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// </Doc>
|
|
// </Doc>
|
|
// <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
|
|
// </Doc>
|
|
// </Doc>
|
|
// <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
|
|
// </Doc>
|
|
// <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
|
|
// <content><![CDATA[<div>This is some content</div>]]></content>
|
|
// <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// </Doc>
|
|
// </Doc>
|
|
// <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
|
|
// <content><![CDATA[<div>This is some content</div>]]></content>
|
|
// <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
|
|
// <content><![CDATA[]]></content>
|
|
// </Doc>
|
|
// </Doc>
|
|
// </Doc>
|
|
// <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
|
|
// templateId +
|
|
// @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
|
|
// </Doc>
|
|
// </Doc>
|
|
// </root>";
|
|
// }
|