diff --git a/src/GitReleaseManager.Core.Tests/Commands/ShowConfigCommandTests.cs b/src/GitReleaseManager.Core.Tests/Commands/ShowConfigCommandTests.cs index 8261b1b7..ff021435 100644 --- a/src/GitReleaseManager.Core.Tests/Commands/ShowConfigCommandTests.cs +++ b/src/GitReleaseManager.Core.Tests/Commands/ShowConfigCommandTests.cs @@ -1,5 +1,7 @@ +using System; using System.Threading.Tasks; using GitReleaseManager.Core.Commands; +using GitReleaseManager.Core.Configuration; using GitReleaseManager.Core.Helpers; using GitReleaseManager.Core.Options; using NSubstitute; @@ -21,7 +23,10 @@ public void Setup() { _fileSystem = Substitute.For(); _logger = Substitute.For(); - _command = new ShowConfigCommand(_fileSystem, _logger); + + var currentDirectory = Environment.CurrentDirectory; + var configuration = ConfigurationProvider.Provide(currentDirectory, _fileSystem); + _command = new ShowConfigCommand(_logger, configuration); } [Test] diff --git a/src/GitReleaseManager.Core/Commands/ShowConfigCommand.cs b/src/GitReleaseManager.Core/Commands/ShowConfigCommand.cs index c4c7423e..41e0bacd 100644 --- a/src/GitReleaseManager.Core/Commands/ShowConfigCommand.cs +++ b/src/GitReleaseManager.Core/Commands/ShowConfigCommand.cs @@ -1,7 +1,5 @@ -using System; using System.Threading.Tasks; using GitReleaseManager.Core.Configuration; -using GitReleaseManager.Core.Helpers; using GitReleaseManager.Core.Options; using Serilog; @@ -9,18 +7,18 @@ namespace GitReleaseManager.Core.Commands { public class ShowConfigCommand : ICommand { - private readonly IFileSystem _fileSystem; private readonly ILogger _logger; + private readonly Config _config; - public ShowConfigCommand(IFileSystem fileSystem, ILogger logger) + public ShowConfigCommand(ILogger logger, Config config) { - _fileSystem = fileSystem; _logger = logger; + _config = config; } public Task ExecuteAsync(ShowConfigSubOptions options) { - var configuration = ConfigurationProvider.GetEffectiveConfigAsString(options.TargetDirectory ?? Environment.CurrentDirectory, _fileSystem); + var configuration = ConfigurationProvider.GetEffectiveConfigAsString(_config); _logger.Information("{Configuration}", configuration); return Task.FromResult(0); diff --git a/src/GitReleaseManager.Core/Configuration/ConfigurationProvider.cs b/src/GitReleaseManager.Core/Configuration/ConfigurationProvider.cs index 72b160fd..57bca662 100644 --- a/src/GitReleaseManager.Core/Configuration/ConfigurationProvider.cs +++ b/src/GitReleaseManager.Core/Configuration/ConfigurationProvider.cs @@ -41,9 +41,8 @@ public static Config Provide(string gitDirectory, IFileSystem fileSystem) return new Config(); } - public static string GetEffectiveConfigAsString(string currentDirectory, IFileSystem fileSystem) + public static string GetEffectiveConfigAsString(Config config) { - var config = Provide(currentDirectory, fileSystem); var stringBuilder = new StringBuilder(); using (var stream = new StringWriter(stringBuilder, CultureInfo.InvariantCulture)) {