* Removed obsoletes from IConfigManipulator. * Removed obsolete models builder extensions. * Removed the obsolete ContentDashboardSettings. * Removed the obsolete InstallMissingDatabase setting on GlobalSettings. * Removed obsolete NuCache settings. * Removed obsolete RuntimeMinificationSettings. * Removed obsolete health check constant. * Removed obsolete icon constant. * Removed obsolete telemetry constant. * Removed obsolete property and constructor on UmbracoBuilder. * Removed obsolete constructor on AuditNotificationsHandler. * Removed obsolete constructor on HTTP header health checks. * Removed obsolete constructor on MediaFileManager. * Removed obsolete GetDefaultFileContent on ViewHelper. * Remove obsoleted methods on embed providers. * Fix tests. * Removed obsolete constructors on BlockEditorDataConverter. * Removed obsolete SeedCacheDuration property on CacheSettings. * Removed obsolete PublishCulture on ContentRepositoryExtensions. * Removed obsolete MonitorLock. * Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository. * Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository. * Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository. * Removed obsolete DateValueEditor constructors. * Removed obsolete GetAutomaticRelationTypesAliases. * Removed obsolete constructor on TextOnlyValueEditor. * Removed obsolete constructors on RegexValidator and RequiredValidator. * Removed obsolete constructs on SliderValueConverter and TagsValueConverter. * Removed obsolete GetContentType methods from IPublishedCache. * Removed ContentFinderByIdPath. * Removed obsolete constructor on DefaultMediaUrlProvider. * Removed obsolete constructor on Domain. * Removed obsolete constructor on PublishedRequest. * Removed obsolete methods on CheckPermissions. * Removed obsolete GetUserId from IBackOfficeSecurity. * Removed obsolete methods on LegacyPasswordSecurity. * Removed obsolete constructors on AuditService. * Removed obsolete methods on IContentEditingService. * Remove obsolete constructors and methods on ContentService/IContentService. * Removed obsolete constructor in ContentTypeEditingService. * Removed obsolete constructor in MediaTypeEditingService. * Removed obsolete constructor in MemberTypeEditingService. * Removed obsolete constructor in ContentTypeService. * Removed obsolete constructors in ContentTypeServiceBase. * Removed obsolete constructors and methods in ContentVersionService. * Removed obsolete constructor in DataTypeUsageService. * Removed obsolete constructor in DomainService. * Removed obsolete constructor in FileService. * Removes obsolete AttemptMove from IContentService. * Removes obsolete SetPreventCleanup from IContentVersionService. * Removes obsolete GetReferences from IDataTypeService. * Removed obsolete SetConsentLevel from IMetricsConsentService. * Removed obsolete methods from IPackageDataInstallation. * Removed obsolete methods from IPackagingService. * Removed obsolete methods on ITwoFactorLoginService. Removed obsolete ITemporaryMediaService. * Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService. * More obsolete constructors. * Removed obsoleted overloads on IPropertyValidationService. * Fixed build for tests. * Removed obsolete constructor for PublicAccessService, UserService and RelationService. * Removed GetDefaultMemberType. * Removed obsolete user group functionality from IUserService. * Removed obsolete extension methods on IUserService. * Removed obsolete method from ITelemetryService. * Removed obsolete UdiParserServiceConnectors. * Removed obsolete method on ICookieManager. * Removed obsolete DynamicContext. * Removed obsolete XmlHelper. * Fixed failing integration tests. * Removed obsoletes in Umbraco.Cms.Api.Common * Removed obsoletes in Umbraco.Cms.Api.Delivery * Removed obsoletes in Umbraco.Cms.Api.Management * Removed obsoletes in Umbraco.Examine.Lucene * Removed obsoletes in Umbraco.Infrastructure * Fix failing delivery API contract integration test. * Made integration tests internal. * Removed obsoletes from web projects. * Fix build. * Removed Twitter OEmbed provider * Removed obsolete constructor on PublishedDataType. * Removed obsolete constructors on PublishedCacheBase. * Removed the obsolete PropertyEditorTagsExtensions. * Removed obsoletion properties on configuration response models (#18697) * Removed obsolete methods from server-side models. * Update client-side types and sdk. * Update client-side files. * Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694) * Removed obsolete method in UserService. (#18710) * Removed obsoleted group alias keys from being publicly available. (#18682) * Removed unneceessary ApiVersion attribute. * Clean-up obsoletions on MemberService (#18703) * Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers. * Removed obsoletion on member service method that's not obsolete on the interface.
299 lines
12 KiB
C#
299 lines
12 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.IO.Compression;
|
|
using System.Linq;
|
|
using System.Xml.Linq;
|
|
using Microsoft.Extensions.Options;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Hosting;
|
|
using Umbraco.Cms.Core.IO;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Packaging;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Tests.Common.Attributes;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
using Umbraco.Extensions;
|
|
using File = System.IO.File;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
|
|
internal sealed class CreatedPackagesRepositoryTests : UmbracoIntegrationTest
|
|
{
|
|
[SetUp]
|
|
public void SetupTestData() => _testBaseFolder = Guid.NewGuid();
|
|
|
|
[TearDown]
|
|
public void DeleteTestFolder() =>
|
|
Directory.Delete(HostingEnvironment.MapPathContentRoot("~/" + _testBaseFolder), true);
|
|
|
|
private Guid _testBaseFolder;
|
|
|
|
private IContentService ContentService => GetRequiredService<IContentService>();
|
|
|
|
private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
|
|
|
|
private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
|
|
|
|
private IFileService FileService => GetRequiredService<IFileService>();
|
|
|
|
private IDictionaryItemService DictionaryItemService => GetRequiredService<IDictionaryItemService>();
|
|
|
|
private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
|
|
|
|
private IEntityXmlSerializer EntityXmlSerializer => GetRequiredService<IEntityXmlSerializer>();
|
|
|
|
private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
|
|
|
|
private IMediaService MediaService => GetRequiredService<IMediaService>();
|
|
|
|
private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
|
|
|
|
private MediaFileManager MediaFileManager => GetRequiredService<MediaFileManager>();
|
|
|
|
private FileSystems FileSystems => GetRequiredService<FileSystems>();
|
|
|
|
public ICreatedPackagesRepository PackageBuilder => new PackagesRepository(
|
|
ContentService,
|
|
ContentTypeService,
|
|
DataTypeService,
|
|
FileService,
|
|
LocalizationService,
|
|
HostingEnvironment,
|
|
EntityXmlSerializer,
|
|
Options.Create(new GlobalSettings()),
|
|
MediaService,
|
|
MediaTypeService,
|
|
MediaFileManager,
|
|
FileSystems,
|
|
"createdPackages.config",
|
|
|
|
// temp paths
|
|
"~/" + _testBaseFolder + "/temp",
|
|
"~/" + _testBaseFolder + "/packages",
|
|
"~/" + _testBaseFolder + "/media");
|
|
|
|
[Test]
|
|
public void Delete()
|
|
{
|
|
var def1 = new PackageDefinition { Name = "test" };
|
|
|
|
var result = PackageBuilder.SavePackage(def1);
|
|
Assert.IsTrue(result);
|
|
|
|
PackageBuilder.Delete(def1.Id);
|
|
|
|
def1 = PackageBuilder.GetById(def1.Id);
|
|
Assert.IsNull(def1);
|
|
}
|
|
|
|
[Test]
|
|
public void Create_New()
|
|
{
|
|
var def1 = new PackageDefinition { Name = "test" };
|
|
|
|
var result = PackageBuilder.SavePackage(def1);
|
|
|
|
Assert.IsTrue(result);
|
|
Assert.AreEqual(1, def1.Id);
|
|
Assert.AreNotEqual(default(Guid).ToString(), def1.PackageId);
|
|
|
|
var def2 = new PackageDefinition { Name = "test2" };
|
|
|
|
result = PackageBuilder.SavePackage(def2);
|
|
|
|
Assert.IsTrue(result);
|
|
Assert.AreEqual(2, def2.Id);
|
|
Assert.AreNotEqual(default(Guid).ToString(), def2.PackageId);
|
|
}
|
|
|
|
[Test]
|
|
public void Update_Not_Found()
|
|
{
|
|
var def = new PackageDefinition
|
|
{
|
|
Id = 3, // doesn't exist
|
|
Name = "test"
|
|
};
|
|
|
|
var result = PackageBuilder.SavePackage(def);
|
|
|
|
Assert.IsFalse(result);
|
|
}
|
|
|
|
[Test]
|
|
public void Update()
|
|
{
|
|
var def = new PackageDefinition { Name = "test" };
|
|
var result = PackageBuilder.SavePackage(def);
|
|
//Update values and save
|
|
def.Name = "updated";
|
|
def.ContentNodeId = "test";
|
|
def.Languages.Add("Danish");
|
|
def.Languages.Add("English");
|
|
def.Scripts.Add("TestScript1");
|
|
def.Scripts.Add("TestScript2");
|
|
result = PackageBuilder.SavePackage(def);
|
|
Assert.IsTrue(result);
|
|
// re-get
|
|
def = PackageBuilder.GetById(def.Id);
|
|
Assert.AreEqual("updated", def.Name);
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual("updated", def.Name);
|
|
Assert.AreEqual("test", def.ContentNodeId);
|
|
Assert.AreEqual(2, def.Languages.Count());
|
|
Assert.AreEqual(2, def.Scripts.Count());
|
|
Assert.AreEqual(0, def.DataTypes.Count());
|
|
Assert.AreEqual(0, def.DictionaryItems.Count());
|
|
Assert.AreEqual(0, def.DocumentTypes.Count());
|
|
Assert.AreEqual(0, def.MediaTypes.Count());
|
|
Assert.AreEqual(0, def.MediaUdis.Count());
|
|
Assert.AreEqual(0, def.PartialViews.Count());
|
|
Assert.AreEqual(0, def.Stylesheets.Count());
|
|
Assert.AreEqual(0, def.Templates.Count());
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenNestedDictionaryItems_WhenPackageExported_ThenTheXmlIsNested()
|
|
{
|
|
var parent = (await DictionaryItemService.CreateAsync(new DictionaryItem("Parent"), Constants.Security.SuperUserKey)).Result;
|
|
var child1 = (await DictionaryItemService.CreateAsync(new DictionaryItem(parent.Key, "Child1"), Constants.Security.SuperUserKey)).Result;
|
|
var child2 = (await DictionaryItemService.CreateAsync(new DictionaryItem(child1.Key, "Child2"), Constants.Security.SuperUserKey)).Result;
|
|
var child3 = (await DictionaryItemService.CreateAsync(new DictionaryItem(child2.Key, "Child3"), Constants.Security.SuperUserKey)).Result;
|
|
var child4 = (await DictionaryItemService.CreateAsync(new DictionaryItem(child3.Key, "Child4"), Constants.Security.SuperUserKey)).Result;
|
|
|
|
var def = new PackageDefinition
|
|
{
|
|
Name = "test",
|
|
|
|
// put these out of order to ensure that it doesn't matter.
|
|
DictionaryItems = new List<string>
|
|
{
|
|
child2.Id.ToString(),
|
|
child1.Id.ToString(),
|
|
// we are missing 3 here so 4 will be orphaned and end up in the root
|
|
child4.Id.ToString(),
|
|
parent.Id.ToString()
|
|
}
|
|
};
|
|
|
|
PackageBuilder.SavePackage(def);
|
|
|
|
var packageXmlPath = PackageBuilder.ExportPackage(def);
|
|
|
|
using (var packageXmlStream = File.OpenRead(packageXmlPath))
|
|
{
|
|
var packageXml = XDocument.Load(packageXmlStream);
|
|
var dictionaryItems = packageXml.Root.Element("DictionaryItems");
|
|
Assert.IsNotNull(dictionaryItems);
|
|
var rootItems = dictionaryItems.Elements("DictionaryItem").ToList();
|
|
Assert.AreEqual(2, rootItems.Count);
|
|
Assert.AreEqual("Child4", rootItems[0].AttributeValue<string>("Name"));
|
|
Assert.AreEqual("Parent", rootItems[1].AttributeValue<string>("Name"));
|
|
var children = rootItems[1].Elements("DictionaryItem").ToList();
|
|
Assert.AreEqual(1, children.Count);
|
|
Assert.AreEqual("Child1", children[0].AttributeValue<string>("Name"));
|
|
children = children[0].Elements("DictionaryItem").ToList();
|
|
Assert.AreEqual(1, children.Count);
|
|
Assert.AreEqual("Child2", children[0].AttributeValue<string>("Name"));
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
[LongRunning]
|
|
public void Export_Zip()
|
|
{
|
|
var mt = MediaTypeBuilder.CreateImageMediaType("testImage");
|
|
MediaTypeService.Save(mt);
|
|
var m1 = MediaBuilder.CreateMediaFile(mt, -1);
|
|
MediaService.Save(m1);
|
|
|
|
//Ensure a file exist
|
|
var fullPath =
|
|
HostingEnvironment.MapPathWebRoot(m1.Properties[Constants.Conventions.Media.File].GetValue().ToString());
|
|
using (var file1 = File.CreateText(fullPath))
|
|
{
|
|
file1.WriteLine("hello");
|
|
}
|
|
|
|
var def = new PackageDefinition { Name = "test", MediaUdis = new List<GuidUdi> { m1.GetUdi() } };
|
|
|
|
var result = PackageBuilder.SavePackage(def);
|
|
Assert.IsTrue(result);
|
|
Assert.IsTrue(def.PackagePath.IsNullOrWhiteSpace());
|
|
|
|
var packageXmlPath = PackageBuilder.ExportPackage(def);
|
|
|
|
def = PackageBuilder.GetById(def.Id); // re-get
|
|
Assert.IsNotNull(def.PackagePath);
|
|
|
|
using (var packageZipStream = File.OpenRead(packageXmlPath))
|
|
using (var zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out var packageXml))
|
|
{
|
|
var test = "test-file.txt";
|
|
Assert.Multiple(() =>
|
|
{
|
|
var mediaEntry = zipArchive.GetEntry("media/media/test-file.txt");
|
|
Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString());
|
|
Assert.IsNotNull(mediaEntry);
|
|
Assert.AreEqual(test, mediaEntry.Name);
|
|
Assert.IsNotNull(zipArchive.GetEntry("package.xml"));
|
|
Assert.AreEqual(
|
|
$"<MediaItems><MediaSet><testImage id=\"{m1.Id}\" key=\"{m1.Key}\" parentID=\"-1\" level=\"1\" creatorID=\"-1\" sortOrder=\"0\" createDate=\"{m1.CreateDate:s}\" updateDate=\"{m1.UpdateDate:s}\" nodeName=\"Test File\" urlName=\"test-file\" path=\"{m1.Path}\" isDoc=\"\" nodeType=\"{mt.Id}\" nodeTypeAlias=\"testImage\" writerName=\"Administrator\" writerID=\"-1\" udi=\"{m1.GetUdi()}\" mediaFilePath=\"/media/test-file.txt\"><umbracoFile><![CDATA[/media/test-file.txt]]></umbracoFile><umbracoBytes><![CDATA[100]]></umbracoBytes><umbracoExtension><![CDATA[png]]></umbracoExtension></testImage></MediaSet></MediaItems>",
|
|
packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting));
|
|
Assert.AreEqual(2, zipArchive.Entries.Count());
|
|
Assert.AreEqual(ZipArchiveMode.Read, zipArchive.Mode);
|
|
Assert.IsNull(packageXml.DocumentType);
|
|
Assert.IsNull(packageXml.NextNode);
|
|
Assert.IsNull(packageXml.Parent);
|
|
Assert.IsNull(packageXml.PreviousNode);
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
[Test]
|
|
public void Export_Xml()
|
|
{
|
|
var template = TemplateBuilder.CreateTextPageTemplate();
|
|
|
|
FileService.SaveTemplate(template);
|
|
|
|
var def = new PackageDefinition { Name = "test", Templates = new[] { template.Id.ToString() } };
|
|
var result = PackageBuilder.SavePackage(def);
|
|
Assert.IsTrue(result);
|
|
Assert.IsTrue(def.PackagePath.IsNullOrWhiteSpace());
|
|
|
|
var packageXmlPath = PackageBuilder.ExportPackage(def); // Get
|
|
|
|
def = PackageBuilder.GetById(def.Id); // re-get
|
|
Assert.IsNotNull(def.PackagePath);
|
|
|
|
using (var packageXmlStream = File.OpenRead(packageXmlPath))
|
|
{
|
|
var xml = XDocument.Load(packageXmlStream);
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual("umbPackage", xml.Root.Name.ToString());
|
|
Assert.AreEqual(
|
|
$"<Templates><Template><Name>Text page</Name><Key>{template.Key}</Key><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>",
|
|
xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
|
|
Assert.IsNull(xml.DocumentType);
|
|
Assert.IsNull(xml.Parent);
|
|
Assert.IsNull(xml.NextNode);
|
|
Assert.IsNull(xml.PreviousNode);
|
|
});
|
|
}
|
|
}
|
|
}
|