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

Merge remote-tracking branch 'origin/netcore/netcore' into feature/clean-up-umbraco-integration-tests

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Tests.Integration/RuntimeTests.cs
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoBuilderExtensions.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
This commit is contained in:
Bjarke Berg
2021-01-18 07:34:59 +01:00
parent eec88b99f4 9d0665e66c
commit 6310ca31e3
398 changed files with 8136 additions and 7403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
View File

@@ -20,6 +20,7 @@ using Umbraco.Core.Composing;
using Umbraco.Core.DependencyInjection;
using Umbraco.Extensions;
using Umbraco.Infrastructure.PublishedCache.DependencyInjection;
using Umbraco.Tests.Integration.DependencyInjection;
using Umbraco.Tests.Integration.Testing;
using Umbraco.Tests.Testing;
using Umbraco.Web;
@@ -28,6 +29,7 @@ using Umbraco.Web.BackOffice.DependencyInjection;
using Umbraco.Web.Common.Controllers;
using Umbraco.Web.Common.DependencyInjection;
using Umbraco.Web.Website.Controllers;
using Umbraco.Web.Website.DependencyInjection;
namespace Umbraco.Tests.Integration.TestServerTest
{
@@ -130,9 +132,10 @@ namespace Umbraco.Tests.Integration.TestServerTest
builder
.AddConfiguration()
.AddTestCore(TestHelper) // This is the important one!
.AddUmbracoCore()
.AddWebComponents()
.AddRuntimeMinifier()
.AddBackOfficeCore()
.AddBackOfficeAuthentication()
.AddBackOfficeIdentity()
.AddBackOfficeAuthorizationPolicies(TestAuthHandler.TestAuthenticationScheme)
@@ -149,7 +152,8 @@ namespace Umbraco.Tests.Integration.TestServerTest
mvcBuilder.AddApplicationPart(typeof(SurfaceController).Assembly);
})
.AddWebServer()
.AddNuCache()
.AddWebsite()
.AddTestServices(TestHelper) // This is the important one!
.Build();
}