yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v10/dev' into v11/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-editor.less
This commit is contained in:
Jacob Overgaard
2023-09-14 13:20:55 +02:00
parent bd9b30f143 0a4cc27a5d
commit 7bbe994fc9
53 changed files with 380 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs
View File

@@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
using NUnit.Framework;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Notifications;
using Umbraco.Cms.Tests.Common.Attributes;
using Umbraco.Cms.Tests.Integration.TestServerTest;
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Events;
@@ -20,6 +21,7 @@ public class EventAggregatorTests : UmbracoTestServerTestBase
}
[Test]
[LongRunning]
public async Task Publish_HandlerWithScopedDependency_DoesNotThrow()
{
var result = await Client.GetAsync("/test-handler-with-scoped-services");

2
tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
View File

@@ -8,6 +8,7 @@ using NUnit.Framework;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.IO.MediaPathSchemes;
using Umbraco.Cms.Tests.Common.Attributes;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.Testing;
@@ -33,6 +34,7 @@ public class FileSystemsTests : UmbracoIntegrationTest
}
[Test]
[LongRunning]
public void Can_Delete_MediaFiles()
{
var mediaFileManager = GetRequiredService<MediaFileManager>();

2
tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs
View File

@@ -10,6 +10,7 @@ using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Tests.Common.Attributes;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.Implementations;
using Umbraco.Cms.Tests.Integration.Testing;
@@ -573,6 +574,7 @@ public class ShadowFileSystemTests : UmbracoIntegrationTest
}
[Test]
[LongRunning]
public void ShadowScopeCompleteWithDirectoryConflict()
{
var path = HostingEnvironment.MapPathContentRoot("FileSysTests");

2
tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
View File

@@ -13,6 +13,7 @@ using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Tests.Common.Attributes;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.Testing;
@@ -140,6 +141,7 @@ public class ContentTypeModelMappingTests : UmbracoIntegrationTest
}
[Test]
[LongRunning]
public void ContentTypeSave_To_IContentType()
{
// Arrange

2
tests/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
View File

@@ -16,6 +16,7 @@ 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;
@@ -217,6 +218,7 @@ public class CreatedPackagesRepositoryTests : UmbracoIntegrationTest
}
[Test]
[LongRunning]
public void Export_Zip()
{
var mt = MediaTypeBuilder.CreateImageMediaType("testImage");

2
tests/Umbraco.Tests.Integration/Umbraco.Core/PublishedContentQueryAccessorTests.cs
View File

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Tests.Common.Attributes;
using Umbraco.Cms.Tests.Integration.TestServerTest;
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core;
@@ -12,6 +13,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core;
public class PublishedContentQueryAccessorTests : UmbracoTestServerTestBase
{
[Test]
[LongRunning]
public async Task PublishedContentQueryAccessor_WithRequestScope_WillProvideQuery()
{
var result = await Client.GetAsync("/demo-published-content-query-accessor");

3541
tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentServiceTests.cs Normal file
View File

File diff suppressed because it is too large Load Diff

2
tests/Umbraco.Tests.Integration/Umbraco.Core/Variants/ContentVariantAllowedActionTests.cs
View File

@@ -6,6 +6,7 @@ using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Tests.Common.Attributes;
using Umbraco.Cms.Tests.Common.Builders;
using Umbraco.Cms.Tests.Common.Builders.Extensions;
using Umbraco.Cms.Tests.Integration.TestServerTest;
@@ -32,6 +33,7 @@ public class ContentVariantAllowedActionTests : UmbracoTestServerTestBase
}
[Test]
[LongRunning]
public void CanCheckIfUserHasAccessToLanguage()
{
// setup user groups