refactor

Author: Andarist

src/github.test.ts

@@ -65,10 +65,9 @@ describe("GitHub", () => {
     await using _gitConfig = await isolateGitConfig();
     const actionToken = "action-token";
     const checkoutToken = "checkout-token";
-    await using remote = await createGitHttpRemote(
-      getAuthorization(actionToken),
-      { "file.txt": "initial\n" },
-    );
+    await using remote = await createGitHttpRemote({
+      "file.txt": "initial\n",
+    });
     await using repositoryFixture = await shallowClone(remote.path);
     const repository = repositoryFixture.path;
 
@@ -113,10 +112,9 @@ describe("GitHub", () => {
   it("uses github-token instead of credentials embedded in the CLI push URL", async () => {
     await using _gitConfig = await isolateGitConfig();
     const actionToken = "action-token";
-    await using remote = await createGitHttpRemote(
-      getAuthorization(actionToken),
-      { "file.txt": "initial\n" },
-    );
+    await using remote = await createGitHttpRemote({
+      "file.txt": "initial\n",
+    });
     await using repositoryFixture = await shallowClone(remote.path);
     const repository = repositoryFixture.path;
 

src/test-utils/gitHttpServer.ts

@@ -23,9 +23,9 @@ function recordRequest(request: IncomingMessage): RecordedRequest {
 }
 
 async function runGitHttpBackend(
+  cwd: string,
   request: IncomingMessage,
   response: ServerResponse,
-  projectRoot: string,
 ) {
   const requestUrl = new URL(
     request.url ?? "/",
@@ -36,7 +36,7 @@ async function runGitHttpBackend(
     CONTENT_LENGTH: request.headers["content-length"] ?? "0",
     GATEWAY_INTERFACE: "CGI/1.1",
     GIT_HTTP_EXPORT_ALL: "1",
-    GIT_PROJECT_ROOT: projectRoot,
+    GIT_PROJECT_ROOT: cwd,
     PATH_INFO: decodeURIComponent(requestUrl.pathname),
     QUERY_STRING: requestUrl.search.slice(1),
     REMOTE_ADDR: request.socket.remoteAddress ?? "",
@@ -115,36 +115,19 @@ async function listen(server: http.Server) {
   }
 }
 
-export async function createGitHttpServer(options: {
-  projectRoot: string;
-  expectedAuthorization: string;
-}) {
+export async function createGitHttpServer(cwd: string) {
   const requests: RecordedRequest[] = [];
   const server = http.createServer((request, response) => {
     const recordedRequest = recordRequest(request);
     requests.push(recordedRequest);
-    const authorizationHeaders = recordedRequest.headers.authorization ?? [];
-
-    if (
-      authorizationHeaders.length !== 1 ||
-      authorizationHeaders[0] !== options.expectedAuthorization
-    ) {
-      response.writeHead(401, {
-        "WWW-Authenticate": 'Basic realm="changesets-action-test"',
-      });
-      response.end();
-      return;
-    }
 
-    void runGitHttpBackend(request, response, options.projectRoot).catch(
-      (error: unknown) => {
-        response.destroy(
-          Error.isError(error)
-            ? error
-            : new Error("Server error", { cause: error }),
-        );
-      },
-    );
+    void runGitHttpBackend(cwd, request, response).catch((error: unknown) => {
+      response.destroy(
+        Error.isError(error)
+          ? error
+          : new Error("Server error", { cause: error }),
+      );
+    });
   });
 
   await listen(server);

src/test-utils/index.ts

@@ -109,17 +109,11 @@ async function createLocalRemote(dir: Fixture) {
   return moveDisposable(stack, fixture);
 }
 
-export async function createGitHttpRemote(
-  expectedAuthorization: string,
-  files: Fixture,
-) {
+export async function createGitHttpRemote(files: Fixture) {
   await using stack = new AsyncDisposableStack();
   const fixture = stack.use(await createLocalRemote(files));
   const server = stack.use(
-    await createGitHttpServer({
-      projectRoot: path.dirname(fixture.path),
-      expectedAuthorization,
-    }),
+    await createGitHttpServer(path.dirname(fixture.path)),
   );
 
   return moveDisposable(stack, {