Register the _replType if specified, otherwise use the default Repl #…

…1298
scriptcs · Jan 11, 2019 · ee571fd · ee571fd
1 parent e9d7734
commit ee571fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/ScriptCs.Hosting/RuntimeServices.cs b/src/ScriptCs.Hosting/RuntimeServices.cs
@@ -55,9 +55,8 @@ protected override IContainer CreateContainer()
             builder.RegisterInstance(this.LogProvider).Exported(x => x.As<ILogProvider>());
             builder.RegisterType(_scriptEngineType).As<IScriptEngine>().SingleInstance();
             builder.RegisterType(_scriptExecutorType).As<IScriptExecutor>().SingleInstance();
-            builder.RegisterType(_replType).As<IRepl>().SingleInstance();
+            builder.RegisterType(_replType ?? typeof(Repl)).As<IRepl>().SingleInstance();
             builder.RegisterType<ScriptServices>().SingleInstance();
-            builder.RegisterType<Repl>().As<IRepl>().SingleInstance();
             builder.RegisterType<Printers>().SingleInstance();
 
             RegisterLineProcessors(builder);

diff --git a/test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs b/test/ScriptCs.Hosting.Tests/RuntimeServicesTests.cs
@@ -271,6 +271,14 @@ public void ShouldRegisterTheOverriddenVisualStudioSolutionWriter()
                 _runtimeServices.Container.Resolve<IVisualStudioSolutionWriter>().ShouldBeType(typeof(MockVisualStudioSolutionWriter));
             }
 
+            [Fact]
+            public void ShouldRegisterTheOverriddenRepl()
+            {
+                var mock = new Mock<IRepl>();
+                _overrides[ typeof( IRepl ) ] = mock.Object.GetType();
+                _runtimeServices.Container.Resolve<IRepl>().ShouldBeType( mock.Object.GetType() );
+            }
+
             [Fact]
             public void ShouldLogOnDebugAnAssemblyLoadFailure()
             {