ALL TESTS PASSING incl coverage threshold, thanks to testing cloud build of preconfigured project

Author: tophtucker

src/deploy.ts

@@ -279,7 +279,7 @@ class Deployer {
     if (!isGit) throw new CliError("Not at root of a git repository.");
 
     const {ownerName, repoName} = await getGitHubRemote();
-    const branch = (await promisify(exec)("git rev-parse --abbrev-ref HEAD")).stdout;
+    const branch = (await promisify(exec)("git rev-parse --abbrev-ref HEAD")).stdout.trim();
     let localRepo = await this.apiClient.getGitHubRepository({ownerName, repoName});
 
     // If a source repository has already been configured, check that it’s

test/deploy-test.ts

@@ -283,6 +283,47 @@ describe("deploy", () => {
       effects.close();
     });
 
+    it("starts cloud build when continuous deployment is enabled for existing project with existing source", async () => {
+      const deployId = "deploy123";
+      getCurrentObservableApi()
+        .handleGetCurrentUser()
+        .handleGetProject({
+          ...DEPLOY_CONFIG,
+          source: {
+            provider: "github",
+            provider_id: "123:456",
+            url: "https://github.com/observablehq/test.git",
+            branch: "main"
+          },
+          latestCreatedDeployId: null
+        })
+        .handleGetRepository({useProviderId: true})
+        .handlePostProjectBuild()
+        .handleGetProject({
+          ...DEPLOY_CONFIG,
+          source: {
+            provider: "github",
+            provider_id: "123:456",
+            url: "https://github.com/observablehq/test.git",
+            branch: "main"
+          },
+          latestCreatedDeployId: deployId
+        })
+        .handleGetDeploy({deployId, deployStatus: "uploaded"})
+        .start();
+      const effects = new MockDeployEffects({deployConfig: {...DEPLOY_CONFIG, continuousDeployment: true}});
+      effects.clack.inputs.push(
+        "bi" // Which app do you want to use?
+      );
+
+      await promisify(exec)(
+        "touch readme.md; git add .; git commit -m 'initial'; git remote add origin https://github.com/observablehq/test.git"
+      );
+
+      await deploy(TEST_OPTIONS, effects);
+
+      effects.close();
+    });
   });
 
   describe("in isolated directory without git repo", () => {

test/mocks/observableApi.ts

@@ -150,6 +150,7 @@ class ObservableApiMock {
     title = "Build test case",
     accessLevel = "private",
     latestCreatedDeployId = null,
+    source = null,
     status = 200
   }: {
     workspaceLogin: string;
@@ -158,6 +159,7 @@ class ObservableApiMock {
     title?: string;
     accessLevel?: string;
     status?: number;
+    source?: GetProjectResponse["source"];
     latestCreatedDeployId?: null | string;
   }): ObservableApiMock {
     const response =
@@ -168,11 +170,11 @@ class ObservableApiMock {
             slug: projectSlug,
             title,
             creator: {id: "user-id", login: "user-login"},
-            owner: {id: "workspace-id", login: "workspace-login"},
+            owner: {id: "workspace-id", login: workspaceLogin},
             latestCreatedDeployId,
             automatic_builds_enabled: true,
             build_environment_id: "abc123",
-            source: null
+            source
           } satisfies GetProjectResponse)
         : emptyErrorBody;
     const headers = authorizationHeader(status !== 401 && status !== 403);
@@ -435,7 +437,7 @@ class ObservableApiMock {
     return this;
   }
 
-  handleGetRepository({status = 200}: {status?: number} = {}) {
+  handleGetRepository({status = 200, useProviderId = false}: {status?: number; useProviderId?: boolean} = {}) {
     const response =
       status === 200
         ? JSON.stringify({
@@ -448,11 +450,24 @@ class ObservableApiMock {
           })
         : emptyErrorBody;
     const headers = authorizationHeader(status !== 401);
-    this._handlers.push((pool) =>
-      pool
-        .intercept({path: "/cli/github/repository?owner=observablehq&repo=test", headers: headersMatcher(headers)})
-        .reply(status, response, {headers: {"content-type": "application/json"}})
-    );
+    if (useProviderId) {
+      // version that accepts provider_id
+      this._handlers.push((pool) =>
+        pool
+          .intercept({
+            path: `/cli/github/repository?provider_id=${encodeURIComponent("123:456")}`,
+            headers: headersMatcher(headers)
+          })
+          .reply(status, response, {headers: {"content-type": "application/json"}})
+      );
+    } else {
+      // version that accepts owner & repo
+      this._handlers.push((pool) =>
+        pool
+          .intercept({path: "/cli/github/repository?owner=observablehq&repo=test", headers: headersMatcher(headers)})
+          .reply(status, response, {headers: {"content-type": "application/json"}})
+      );
+    }
     return this;
   }