#201 - fix env di + testing

Author: Stepami

src/Infrastructure/HydraScript.Infrastructure/ServiceCollectionExtensions.cs

@@ -24,7 +24,7 @@ public static IServiceCollection AddDomain<TGeneratedRegexContainer>(this IServi
         services.AddSingleton<ILexer, RegexLexer>();
         services.AddSingleton<IParser, TopDownParser>();
 
-        services.AddSingleton<IEnvironmentVariableProvider, SystemEnvironmentVariableProvider>();
+        services.AddSingleton(SystemEnvironmentVariableProvider.Instance);
         services.AddSingleton<IOutputWriter, LoggingWriter>();
         services.AddSingleton<IVirtualMachine, VirtualMachine>();
 

tests/HydraScript.IntegrationTests/TestHostFixture.cs

@@ -1,6 +1,7 @@
 using System.IO.Abstractions;
 using HydraScript.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Serilog;
@@ -15,6 +16,7 @@ public record Options(
         string FileName = ScriptFileName + ".js",
         bool Dump = false,
         bool MockFileSystem = true,
+        bool MockEnv = true,
         string InMemoryScript = "");
 
     public class Runner(ServiceProvider serviceProvider, Executor executor): IDisposable
@@ -54,7 +56,13 @@ public Runner GetRunner(Options options, Action<IServiceCollection>? configureTe
         if (options.MockFileSystem)
         {
             var fileSystem = Substitute.For<IFileSystem>();
-            services.AddSingleton(fileSystem);
+            services.Replace(ServiceDescriptor.Singleton(fileSystem));
+        }
+
+        if (options.MockEnv)
+        {
+            var env = Substitute.For<IEnvironmentVariableProvider>();
+            services.Replace(ServiceDescriptor.Singleton(env));
         }
 
         if (!string.IsNullOrWhiteSpace(options.InMemoryScript))