* 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>
201 lines
8.3 KiB
C#
201 lines
8.3 KiB
C#
// using System.Globalization;
|
|
// using Microsoft.Extensions.Logging;
|
|
// using Moq;
|
|
// using NUnit.Framework;
|
|
// using Umbraco.Cms.Core.Configuration.Models;
|
|
// using Umbraco.Cms.Core.Models;
|
|
// using Umbraco.Cms.Core.Routing;
|
|
// using Umbraco.Cms.Core.Services;
|
|
// using Umbraco.Cms.Infrastructure.PublishedCache;
|
|
// using Umbraco.Cms.Tests.Common.Builders;
|
|
// 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 GetContentUrlsTests : PublishedSnapshotServiceTestBase
|
|
// {
|
|
// [SetUp]
|
|
// public override void Setup()
|
|
// {
|
|
// base.Setup();
|
|
//
|
|
// _webRoutingSettings = new WebRoutingSettings();
|
|
// _requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
|
|
//
|
|
// GlobalSettings.HideTopLevelNodeFromPath = false;
|
|
//
|
|
// var xml = PublishedContentXml.BaseWebTestXml(1234);
|
|
//
|
|
// IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
|
|
// xml,
|
|
// TestHelper.ShortStringHelper,
|
|
// out var contentTypes,
|
|
// out var dataTypes).ToList();
|
|
//
|
|
// InitializedCache(kits, contentTypes, dataTypes);
|
|
// }
|
|
//
|
|
// private WebRoutingSettings _webRoutingSettings;
|
|
// private RequestHandlerSettings _requestHandlerSettings;
|
|
//
|
|
// private ILocalizedTextService GetTextService()
|
|
// {
|
|
// var textService = new Mock<ILocalizedTextService>();
|
|
// textService.Setup(x => x.Localize(
|
|
// It.IsAny<string>(),
|
|
// It.IsAny<string>(),
|
|
// It.IsAny<CultureInfo>(),
|
|
// It.IsAny<IDictionary<string, string>>()))
|
|
// .Returns((string key, string alias, CultureInfo culture, IDictionary<string, string> args)
|
|
// => $"{key}/{alias}");
|
|
//
|
|
// return textService.Object;
|
|
// }
|
|
//
|
|
// private ILanguageService GetLangService(params string[] isoCodes)
|
|
// {
|
|
// var allLangs = isoCodes
|
|
// .Select(CultureInfo.GetCultureInfo)
|
|
// .Select(culture => new Language(culture.Name, culture.EnglishName) { IsDefault = true, IsMandatory = true })
|
|
// .ToArray();
|
|
//
|
|
// var langServiceMock = new Mock<ILanguageService>();
|
|
// langServiceMock.Setup(x => x.GetAllAsync()).ReturnsAsync(allLangs);
|
|
// langServiceMock.Setup(x => x.GetDefaultIsoCodeAsync()).ReturnsAsync(allLangs.First(x => x.IsDefault).IsoCode);
|
|
//
|
|
// return langServiceMock.Object;
|
|
// }
|
|
//
|
|
// [Test]
|
|
// public async Task Content_Not_Published()
|
|
// {
|
|
// var contentType = ContentTypeBuilder.CreateBasicContentType();
|
|
// var content = ContentBuilder.CreateBasicContent(contentType);
|
|
// content.Id = 1046; // TODO: we are using this ID only because it's built into the test XML published cache
|
|
// content.Path = "-1,1046";
|
|
//
|
|
// var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
|
|
// var publishedRouter = CreatePublishedRouter(
|
|
// umbracoContextAccessor,
|
|
// new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
|
|
// var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
|
|
//
|
|
// var urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out var uriUtility);
|
|
//
|
|
// var urls = (await content.GetContentUrlsAsync(
|
|
// publishedRouter,
|
|
// umbracoContext,
|
|
// GetLangService("en-US", "fr-FR"),
|
|
// GetTextService(),
|
|
// Mock.Of<IContentService>(),
|
|
// VariationContextAccessor,
|
|
// Mock.Of<ILogger<IContent>>(),
|
|
// uriUtility,
|
|
// urlProvider)).ToList();
|
|
//
|
|
// Assert.AreEqual(1, urls.Count);
|
|
// Assert.AreEqual("content/itemNotPublished", urls[0].Text);
|
|
// Assert.IsFalse(urls[0].IsUrl);
|
|
// }
|
|
//
|
|
// [Test]
|
|
// public async Task Invariant_Root_Content_Published_No_Domains()
|
|
// {
|
|
// var contentType = ContentTypeBuilder.CreateBasicContentType();
|
|
// var content = ContentBuilder.CreateBasicContent(contentType);
|
|
// content.Id = 1046; // TODO: we are using this ID only because it's built into the test XML published cache
|
|
// content.Path = "-1,1046";
|
|
// content.Published = true;
|
|
//
|
|
// var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
|
|
// var publishedRouter = CreatePublishedRouter(
|
|
// umbracoContextAccessor,
|
|
// new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
|
|
// var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
|
|
//
|
|
// var urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out var uriUtility);
|
|
//
|
|
// var urls = (await content.GetContentUrlsAsync(
|
|
// publishedRouter,
|
|
// umbracoContext,
|
|
// GetLangService("en-US", "fr-FR"),
|
|
// GetTextService(),
|
|
// Mock.Of<IContentService>(),
|
|
// VariationContextAccessor,
|
|
// Mock.Of<ILogger<IContent>>(),
|
|
// uriUtility,
|
|
// urlProvider)).ToList();
|
|
//
|
|
// Assert.AreEqual(2, urls.Count);
|
|
//
|
|
// var enUrl = urls.First(x => x.Culture == "en-US");
|
|
//
|
|
// Assert.AreEqual("/home/", enUrl.Text);
|
|
// Assert.AreEqual("en-US", enUrl.Culture);
|
|
// Assert.IsTrue(enUrl.IsUrl);
|
|
//
|
|
// var frUrl = urls.First(x => x.Culture == "fr-FR");
|
|
//
|
|
// Assert.IsFalse(frUrl.IsUrl);
|
|
// }
|
|
//
|
|
// [Test]
|
|
// public async Task Invariant_Child_Content_Published_No_Domains()
|
|
// {
|
|
// var contentType = ContentTypeBuilder.CreateBasicContentType();
|
|
// var parent = ContentBuilder.CreateBasicContent(contentType);
|
|
// parent.Id = 1046; // TODO: we are using this ID only because it's built into the test XML published cache
|
|
// parent.Name = "home";
|
|
// parent.Path = "-1,1046";
|
|
// parent.Published = true;
|
|
// var child = ContentBuilder.CreateBasicContent(contentType);
|
|
// child.Name = "sub1";
|
|
// child.Id = 1173; // TODO: we are using this ID only because it's built into the test XML published cache
|
|
// child.Path = "-1,1046,1173";
|
|
// child.Published = true;
|
|
//
|
|
// var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
|
|
// var publishedRouter = CreatePublishedRouter(
|
|
// umbracoContextAccessor,
|
|
// new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
|
|
// var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
|
|
//
|
|
// var localizationService = GetLangService("en-US", "fr-FR");
|
|
// var urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out var uriUtility);
|
|
//
|
|
// var urls = (await child.GetContentUrlsAsync(
|
|
// publishedRouter,
|
|
// umbracoContext,
|
|
// localizationService,
|
|
// GetTextService(),
|
|
// Mock.Of<IContentService>(),
|
|
// VariationContextAccessor,
|
|
// Mock.Of<ILogger<IContent>>(),
|
|
// uriUtility,
|
|
// urlProvider)).ToList();
|
|
//
|
|
// Assert.AreEqual(2, urls.Count);
|
|
//
|
|
// var enUrl = urls.First(x => x.Culture == "en-US");
|
|
//
|
|
// Assert.AreEqual("/home/sub1/", enUrl.Text);
|
|
// Assert.AreEqual("en-US", enUrl.Culture);
|
|
// Assert.IsTrue(enUrl.IsUrl);
|
|
//
|
|
// var frUrl = urls.First(x => x.Culture == "fr-FR");
|
|
//
|
|
// Assert.IsFalse(frUrl.IsUrl);
|
|
// }
|
|
//
|
|
// // TODO: We need a lot of tests here, the above was just to get started with being able to unit test this method
|
|
// // * variant URLs without domains assigned, what happens?
|
|
// // * variant URLs with domains assigned, but also having more languages installed than there are domains/cultures assigned
|
|
// // * variant URLs with an ancestor culture unpublished
|
|
// // * invariant URLs with ancestors as variants
|
|
// // * ... probably a lot more
|
|
// }
|