Undo changes to CLI tests

Author: joperezr

tests/Aspire.Cli.Tests/Commands/ConfigCommandTests.cs

@@ -92,7 +92,7 @@ public async Task ConfigSetCommand_WithDeepDotNotation_CreatesDeeplyNestedObject
         var json = await File.ReadAllTextAsync(settingsPath);
         var settings = JsonNode.Parse(json)?.AsObject();
         Assert.NotNull(settings);
-
+        
         Assert.True(settings["foo"] is JsonObject);
         var fooObject = settings["foo"]!.AsObject();
         Assert.True(fooObject["bar"] is JsonObject);
@@ -108,7 +108,7 @@ public async Task ConfigSetCommand_ReplacesPrimitiveWithObject()
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<Aspire.Cli.Commands.RootCommand>();
-
+        
         // First set a primitive value
         var result1 = command.Parse("config set foo primitive");
         var exitCode1 = await result1.InvokeAsync().WaitAsync(CliTestConstants.DefaultTimeout);
@@ -124,7 +124,7 @@ public async Task ConfigSetCommand_ReplacesPrimitiveWithObject()
         var json = await File.ReadAllTextAsync(settingsPath);
         var settings = JsonNode.Parse(json)?.AsObject();
         Assert.NotNull(settings);
-
+        
         Assert.True(settings["foo"] is JsonObject);
         var fooObject = settings["foo"]!.AsObject();
         Assert.Equal("nested", fooObject["bar"]?.ToString());
@@ -244,7 +244,7 @@ public async Task ConfigDeleteCommand_CleansUpEmptyParentObjects()
         var json = await File.ReadAllTextAsync(settingsPath);
         var settings = JsonNode.Parse(json)?.AsObject();
         Assert.NotNull(settings);
-
+        
         // The deep object should be completely removed since it became empty
         Assert.False(settings.ContainsKey("deep"));
     }
@@ -340,4 +340,18 @@ public async Task FeatureFlags_WhenSetToInvalidValue_ReturnsFalse()
         var featureFlags = provider.GetRequiredService<IFeatures>();
         Assert.False(featureFlags.IsFeatureEnabled("testFeature", defaultValue: true));
     }
-}
+
+    [Fact]
+    public void DeployCommand_IsAlwaysAvailable()
+    {
+        using var workspace = TemporaryWorkspace.Create(outputHelper);
+        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
+        var provider = services.BuildServiceProvider();
+
+        var rootCommand = provider.GetRequiredService<Aspire.Cli.Commands.RootCommand>();
+        
+        // Check that deploy command is always available
+        var hasDeployCommand = rootCommand.Subcommands.Any(cmd => cmd.Name == "deploy");
+        Assert.True(hasDeployCommand);
+    }
+}

tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs

@@ -17,7 +17,7 @@ public async Task DeployCommandWithHelpArgumentReturnsZero()
     {
         using var tempRepo = TemporaryWorkspace.Create(outputHelper);
 
-        var services = CliTestHelper.CreateServiceCollection(tempRepo, outputHelper, options => options.EnabledFeatures = [KnownFeatures.DeployCommandEnabled]);
+        var services = CliTestHelper.CreateServiceCollection(tempRepo, outputHelper);
         var provider = services.BuildServiceProvider();
 
         var command = provider.GetRequiredService<RootCommand>();
@@ -35,7 +35,6 @@ public async Task DeployCommandFailsWithInvalidProjectFile()
         // Arrange
         var services = CliTestHelper.CreateServiceCollection(tempRepo, outputHelper, options =>
         {
-            options.EnabledFeatures = [KnownFeatures.DeployCommandEnabled];
             options.DotNetCliRunnerFactory = (sp) =>
             {
                 var runner = new TestDotNetCliRunner
@@ -69,7 +68,7 @@ public async Task DeployCommandFailsWhenAppHostIsNotCompatible()
         var services = CliTestHelper.CreateServiceCollection(tempRepo, outputHelper, options =>
         {
             options.ProjectLocatorFactory = (sp) => new TestProjectLocator();
-            options.EnabledFeatures = [KnownFeatures.DeployCommandEnabled];
+
             options.DotNetCliRunnerFactory = (sp) =>
             {
                 var runner = new TestDotNetCliRunner
@@ -103,7 +102,7 @@ public async Task DeployCommandFailsWhenAppHostBuildFails()
         var services = CliTestHelper.CreateServiceCollection(tempRepo, outputHelper, options =>
         {
             options.ProjectLocatorFactory = (sp) => new TestProjectLocator();
-            options.EnabledFeatures = [KnownFeatures.DeployCommandEnabled];
+
             options.DotNetCliRunnerFactory = (sp) =>
             {
                 var runner = new TestDotNetCliRunner
@@ -137,7 +136,7 @@ public async Task DeployCommandSucceedsEndToEnd()
         var services = CliTestHelper.CreateServiceCollection(tempRepo, outputHelper, options =>
         {
             options.ProjectLocatorFactory = (sp) => new TestProjectLocator();
-            options.EnabledFeatures = [KnownFeatures.DeployCommandEnabled];
+
             options.DotNetCliRunnerFactory = (sp) =>
             {
                 var runner = new TestDotNetCliRunner
@@ -201,7 +200,7 @@ public async Task DeployCommandIncludesDeployFlagInArguments()
         var services = CliTestHelper.CreateServiceCollection(tempRepo, outputHelper, options =>
         {
             options.ProjectLocatorFactory = (sp) => new TestProjectLocator();
-            options.EnabledFeatures = [KnownFeatures.DeployCommandEnabled];
+
             options.DotNetCliRunnerFactory = (sp) =>
             {
                 var runner = new TestDotNetCliRunner
@@ -257,38 +256,6 @@ public async Task DeployCommandIncludesDeployFlagInArguments()
         // Assert
         Assert.Equal(0, exitCode);
     }
-
-    [Fact]
-    public void DeployCommand_WhenFeatureFlagDisabled_IsNotAvailable()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(workspace, outputHelper);
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-
-        // Check that the deploy command is not available in the subcommands
-        var deployCommand = command.Subcommands.FirstOrDefault(c => c.Name == "deploy");
-        Assert.Null(deployCommand);
-    }
-
-    [Fact]
-    public void DeployCommand_WhenFeatureFlagEnabled_IsAvailable()
-    {
-        using var workspace = TemporaryWorkspace.Create(outputHelper);
-        var services = CliTestHelper.CreateServiceCollection(
-            workspace,
-            outputHelper,
-            options => options.EnabledFeatures = [KnownFeatures.DeployCommandEnabled]
-        );
-        var provider = services.BuildServiceProvider();
-
-        var command = provider.GetRequiredService<RootCommand>();
-
-        // Check that the deploy command is available in the subcommands
-        var deployCommand = command.Subcommands.FirstOrDefault(c => c.Name == "deploy");
-        Assert.NotNull(deployCommand);
-    }
 }
 
 internal sealed class TestDeployCommandPrompter(IInteractionService interactionService) : PublishCommandPrompter(interactionService)

tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs

@@ -212,11 +212,6 @@ public IProjectLocator CreateDefaultProjectLocatorFactory(IServiceProvider servi
         return new TestDotNetSdkInstaller();
     };
 
-    public Func<IServiceProvider, IDotNetSdkInstaller> DotNetSdkInstallerFactory { get; set; } = (IServiceProvider serviceProvider) =>
-    {
-        return new TestDotNetSdkInstaller();
-    };
-
     public Func<IServiceProvider, INuGetPackageCache> NuGetPackageCacheFactory { get; set; } = (IServiceProvider serviceProvider) =>
     {
         var logger = serviceProvider.GetRequiredService<ILogger<NuGetPackageCache>>();