From 5f4cd14937e5e08ff39073d1a7ec76e061e08dfb Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sat, 22 Aug 2015 20:13:46 +0100 Subject: [PATCH] Changed the lifetime of DB services to match their lifetime scope. This enables tests that involve multi threading and child lifetime scopes. --- src/Orchard.Tests/DatabaseEnabledTestsBase.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Tests/DatabaseEnabledTestsBase.cs b/src/Orchard.Tests/DatabaseEnabledTestsBase.cs index b1d782cc0..e2f1fda3c 100644 --- a/src/Orchard.Tests/DatabaseEnabledTestsBase.cs +++ b/src/Orchard.Tests/DatabaseEnabledTestsBase.cs @@ -47,9 +47,10 @@ namespace Orchard.Tests { builder.RegisterType().As(); builder.RegisterInstance(new StubLocator(_session)).As(); builder.RegisterInstance(_clock).As(); - builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)); + builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)).InstancePerLifetimeScope(); builder.RegisterInstance(new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" }); - builder.RegisterInstance(new TestTransactionManager(_session)).As(); + builder.RegisterType().As().InstancePerLifetimeScope(); + builder.Register(context => _sessionFactory.OpenSession()).As().InstancePerLifetimeScope(); Register(builder); _container = builder.Build();