Update tests to use bundled CLI

Author: SteveSandersonMS

dotnet/test/ClientTests.cs

@@ -8,37 +8,12 @@ namespace GitHub.Copilot.SDK.Test;
 
 // These tests bypass E2ETestBase because they are about how the CLI subprocess is started
 // Other test classes should instead inherit from E2ETestBase
-public class ClientTests : IAsyncLifetime
+public class ClientTests
 {
-    private string _cliPath = null!;
-
-    public Task InitializeAsync()
-    {
-        _cliPath = GetCliPath();
-        return Task.CompletedTask;
-    }
-
-    public Task DisposeAsync() => Task.CompletedTask;
-
-    private static string GetCliPath()
-    {
-        var envPath = Environment.GetEnvironmentVariable("COPILOT_CLI_PATH");
-        if (!string.IsNullOrEmpty(envPath)) return envPath;
-
-        var dir = new DirectoryInfo(AppContext.BaseDirectory);
-        while (dir != null)
-        {
-            var path = Path.Combine(dir.FullName, "nodejs/node_modules/@github/copilot/index.js");
-            if (File.Exists(path)) return path;
-            dir = dir.Parent;
-        }
-        throw new InvalidOperationException("CLI not found. Run 'npm install' in the nodejs directory first.");
-    }
-
     [Fact]
     public async Task Should_Start_And_Connect_To_Server_Using_Stdio()
     {
-        using var client = new CopilotClient(new CopilotClientOptions { CliPath = _cliPath, UseStdio = true });
+        using var client = new CopilotClient(new CopilotClientOptions { UseStdio = true });
 
         try
         {
@@ -61,7 +36,7 @@ public async Task Should_Start_And_Connect_To_Server_Using_Stdio()
     [Fact]
     public async Task Should_Start_And_Connect_To_Server_Using_Tcp()
     {
-        using var client = new CopilotClient(new CopilotClientOptions { CliPath = _cliPath, UseStdio = false });
+        using var client = new CopilotClient(new CopilotClientOptions { UseStdio = false });
 
         try
         {
@@ -82,7 +57,7 @@ public async Task Should_Start_And_Connect_To_Server_Using_Tcp()
     [Fact]
     public async Task Should_Force_Stop_Without_Cleanup()
     {
-        using var client = new CopilotClient(new CopilotClientOptions { CliPath = _cliPath });
+        using var client = new CopilotClient(new CopilotClientOptions());
 
         await client.CreateSessionAsync();
         await client.ForceStopAsync();
@@ -93,7 +68,7 @@ public async Task Should_Force_Stop_Without_Cleanup()
     [Fact]
     public async Task Should_Get_Status_With_Version_And_Protocol_Info()
     {
-        using var client = new CopilotClient(new CopilotClientOptions { CliPath = _cliPath, UseStdio = true });
+        using var client = new CopilotClient(new CopilotClientOptions { UseStdio = true });
 
         try
         {
@@ -115,7 +90,7 @@ public async Task Should_Get_Status_With_Version_And_Protocol_Info()
     [Fact]
     public async Task Should_Get_Auth_Status()
     {
-        using var client = new CopilotClient(new CopilotClientOptions { CliPath = _cliPath, UseStdio = true });
+        using var client = new CopilotClient(new CopilotClientOptions { UseStdio = true });
 
         try
         {
@@ -140,7 +115,7 @@ public async Task Should_Get_Auth_Status()
     [Fact]
     public async Task Should_List_Models_When_Authenticated()
     {
-        using var client = new CopilotClient(new CopilotClientOptions { CliPath = _cliPath, UseStdio = true });
+        using var client = new CopilotClient(new CopilotClientOptions { UseStdio = true });
 
         try
         {
@@ -178,7 +153,6 @@ public void Should_Accept_GithubToken_Option()
     {
         var options = new CopilotClientOptions
         {
-            CliPath = _cliPath,
             GithubToken = "gho_test_token"
         };
 
@@ -188,7 +162,7 @@ public void Should_Accept_GithubToken_Option()
     [Fact]
     public void Should_Default_UseLoggedInUser_To_Null()
     {
-        var options = new CopilotClientOptions { CliPath = _cliPath };
+        var options = new CopilotClientOptions();
 
         Assert.Null(options.UseLoggedInUser);
     }
@@ -198,7 +172,6 @@ public void Should_Allow_Explicit_UseLoggedInUser_False()
     {
         var options = new CopilotClientOptions
         {
-            CliPath = _cliPath,
             UseLoggedInUser = false
         };
 
@@ -210,7 +183,6 @@ public void Should_Allow_Explicit_UseLoggedInUser_True_With_GithubToken()
     {
         var options = new CopilotClientOptions
         {
-            CliPath = _cliPath,
             GithubToken = "gho_test_token",
             UseLoggedInUser = true
         };

dotnet/test/Harness/E2ETestContext.cs

@@ -9,17 +9,15 @@ namespace GitHub.Copilot.SDK.Test.Harness;
 
 public class E2ETestContext : IAsyncDisposable
 {
-    public string CliPath { get; }
     public string HomeDir { get; }
     public string WorkDir { get; }
     public string ProxyUrl { get; }
 
     private readonly CapiProxy _proxy;
     private readonly string _repoRoot;
 
-    private E2ETestContext(string cliPath, string homeDir, string workDir, string proxyUrl, CapiProxy proxy, string repoRoot)
+    private E2ETestContext(string homeDir, string workDir, string proxyUrl, CapiProxy proxy, string repoRoot)
     {
-        CliPath = cliPath;
         HomeDir = homeDir;
         WorkDir = workDir;
         ProxyUrl = proxyUrl;
@@ -30,7 +28,6 @@ private E2ETestContext(string cliPath, string homeDir, string workDir, string pr
     public static async Task<E2ETestContext> CreateAsync()
     {
         var repoRoot = FindRepoRoot();
-        var cliPath = GetCliPath(repoRoot);
 
         var homeDir = Path.Combine(Path.GetTempPath(), $"copilot-test-config-{Guid.NewGuid()}");
         var workDir = Path.Combine(Path.GetTempPath(), $"copilot-test-work-{Guid.NewGuid()}");
@@ -41,7 +38,7 @@ public static async Task<E2ETestContext> CreateAsync()
         var proxy = new CapiProxy();
         var proxyUrl = await proxy.StartAsync();
 
-        return new E2ETestContext(cliPath, homeDir, workDir, proxyUrl, proxy, repoRoot);
+        return new E2ETestContext(homeDir, workDir, proxyUrl, proxy, repoRoot);
     }
 
     private static string FindRepoRoot()
@@ -94,7 +91,6 @@ public IReadOnlyDictionary<string, string> GetEnvironment()
 
     public CopilotClient CreateClient() => new(new CopilotClientOptions
     {
-        CliPath = CliPath,
         Cwd = WorkDir,
         Environment = GetEnvironment(),
         GithubToken = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CI")) ? "fake-token-for-e2e-tests" : null,