From d036c6a118a5b6db13ef0c9696a2fb897309ac63 Mon Sep 17 00:00:00 2001 From: Paul Johnson Date: Tue, 5 Apr 2022 10:18:04 +0100 Subject: [PATCH] Fix tests when running filtered set (SQL Server) Without InstallDefaultDataSettings DatabaseSchemaCreator makes use of static service locator which isn't wired up in time. --- .../Testing/SqlServerBaseTestDatabase.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs index 10d24eb01b..391eace430 100644 --- a/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs +++ b/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs @@ -6,9 +6,11 @@ using Microsoft.Data.SqlClient; using Microsoft.Extensions.Logging; using Moq; using Umbraco.Cms.Core.Configuration; +using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Infrastructure.Migrations.Install; using Umbraco.Cms.Infrastructure.Persistence; +using Umbraco.Cms.Tests.Common; namespace Umbraco.Cms.Tests.Integration.Testing; @@ -101,11 +103,15 @@ public abstract class SqlServerBaseTestDatabase : BaseTestDatabase using (NPoco.ITransaction transaction = database.GetTransaction()) { + var options = new TestOptionsMonitor(new InstallDefaultDataSettings { InstallData = InstallDefaultDataOption.All }); + var schemaCreator = new DatabaseSchemaCreator( database, _loggerFactory.CreateLogger(), _loggerFactory, new UmbracoVersion(), - Mock.Of()); + Mock.Of(), + options); + schemaCreator.InitializeDatabaseSchema(); transaction.Complete();