refactor

Author: Andarist

src/github.test.ts

@@ -15,7 +15,6 @@ const githubContext = vi.hoisted(() => ({
     owner: "changesets",
     repo: "action",
   },
-  serverUrl: "http://127.0.0.1",
   sha: "base-sha",
 }));
 
@@ -74,7 +73,6 @@ describe("GitHub", () => {
     const repository = repositoryFixture.path;
 
     const serverUrl = new URL(remote.url).origin;
-    githubContext.serverUrl = serverUrl;
     await git(repository, ["remote", "set-url", "origin", remote.url]);
     await git(repository, [
       "config",
@@ -87,6 +85,7 @@ describe("GitHub", () => {
       cwd: repository,
       githubToken: actionToken,
       pushWithGitCli: true,
+      serverUrl,
     });
 
     await github.pushChanges({
@@ -122,7 +121,6 @@ describe("GitHub", () => {
     const repository = repositoryFixture.path;
 
     const remoteUrl = new URL(remote.url);
-    githubContext.serverUrl = remoteUrl.origin;
     remoteUrl.username = "x-access-token";
     remoteUrl.password = "checkout-token";
     await git(repository, ["remote", "set-url", "origin", remoteUrl.href]);
@@ -139,6 +137,7 @@ describe("GitHub", () => {
       cwd: repository,
       githubToken: actionToken,
       pushWithGitCli: true,
+      serverUrl: remoteUrl.origin,
     });
 
     await github.pushChanges({

src/github.ts

@@ -72,15 +72,23 @@ export class GitHub {
   readonly octokit: Octokit;
   readonly cwd: string;
   readonly pushWithGitCli: boolean;
+  readonly serverUrl: string;
 
   constructor(options: {
     githubToken: string;
     cwd: string;
     pushWithGitCli?: boolean;
+    serverUrl?: string;
   }) {
     this.#githubToken = options.githubToken;
     this.cwd = options.cwd;
     this.pushWithGitCli = options.pushWithGitCli ?? false;
+    this.serverUrl = (
+      options.serverUrl ??
+      context.serverUrl ??
+      process.env.GITHUB_SERVER_URL ??
+      "https://github.com"
+    ).replace(/\/+$/, "");
     this.octokit = setupOctokit(options.githubToken);
   }
 
@@ -92,11 +100,6 @@ export class GitHub {
     const basic = Buffer.from(`x-access-token:${this.#githubToken}`).toString(
       "base64",
     );
-    const serverUrl = (
-      context.serverUrl ??
-      process.env.GITHUB_SERVER_URL ??
-      "https://github.com"
-    ).replace(/\/+$/, "");
     const gitConfigCount = Number(process.env.GIT_CONFIG_COUNT ?? 0);
     if (!Number.isInteger(gitConfigCount) || gitConfigCount < 0) {
       throw new Error(
@@ -121,7 +124,7 @@ export class GitHub {
     // extraheader normally installed by actions/checkout, while an exact push
     // URL also outranks any inherited path-specific extraheader. Only the most
     // specific matching subsection contributes, so these do not duplicate it.
-    const extraHeaderKeys = new Set([`http.${serverUrl}/.extraheader`]);
+    const extraHeaderKeys = new Set([`http.${this.serverUrl}/.extraheader`]);
     for (const remoteUrl of stdout.split(/\r?\n/)) {
       const httpUrl = getHttpUrl(remoteUrl);
       if (httpUrl !== undefined) {