whoohoo end-to-end test of kicking off cloud build

Author: tophtucker

src/deploy.ts

@@ -38,10 +38,6 @@ const BUILD_AGE_WARNING_MS = 1000 * 60 * 5;
 
 const OBSERVABLE_UI_ORIGIN = getObservableUiOrigin();
 
-export function formatGitUrl(url: string) {
-  return new URL(url).pathname.slice(1).replace(/\.git$/, "");
-}
-
 function settingsUrl(deployTarget: DeployTargetInfo) {
   if (deployTarget.create) {
     throw new Error("Incorrect deploy target state");

test/deploy-test.ts

@@ -231,12 +231,12 @@ describe("deploy", () => {
           workspaceLogin: DEPLOY_CONFIG.workspaceLogin,
           projects: []
         })
-        .handlePostProject({projectId: DEPLOY_CONFIG.projectId})
+        .handlePostProject({projectId: DEPLOY_CONFIG.projectId, slug: DEPLOY_CONFIG.projectSlug})
         .start();
       const effects = new MockDeployEffects();
       effects.clack.inputs.push(
         true, // No apps found. Do you want to create a new app?
-        "cloud-deployed-app", // What slug do you want to use?
+        DEPLOY_CONFIG.projectSlug, // What slug do you want to use?
         "public", // Who is allowed to access your app?
         true // Do you want to enable continuous deployment?
       );
@@ -250,6 +250,39 @@ describe("deploy", () => {
 
       effects.close();
     });
+
+    it("starts cloud build when continuous deployment is enabled and repo is valid", async () => {
+      const deployId = "deploy123";
+      getCurrentObservableApi()
+        .handleGetCurrentUser()
+        .handleGetWorkspaceProjects({
+          workspaceLogin: DEPLOY_CONFIG.workspaceLogin,
+          projects: []
+        })
+        .handlePostProject({projectId: DEPLOY_CONFIG.projectId, slug: DEPLOY_CONFIG.projectSlug})
+        .handleGetRepository()
+        .handlePostProjectEnvironment()
+        .handlePostProjectBuild()
+        .handleGetProject({...DEPLOY_CONFIG, latestCreatedDeployId: deployId})
+        .handleGetDeploy({deployId, deployStatus: "uploaded"})
+        .start();
+      const effects = new MockDeployEffects();
+      effects.clack.inputs.push(
+        true, // No apps found. Do you want to create a new app?
+        DEPLOY_CONFIG.projectSlug, // What slug do you want to use?
+        "public", // Who is allowed to access your app?
+        true // Do you want to enable continuous deployment?
+      );
+
+      await promisify(exec)(
+        "touch readme.md; git add .; git commit -m 'initial'; git remote add origin [email protected]:observablehq/test.git"
+      );
+
+      await deploy(TEST_OPTIONS, effects);
+
+      effects.close();
+    });
+
   });
 
   describe("in isolated directory without git repo", () => {
@@ -267,7 +300,7 @@ describe("deploy", () => {
       const effects = new MockDeployEffects();
       effects.clack.inputs.push(
         true, // No apps found. Do you want to create a new app?
-        "cloud-deployed-app", // What slug do you want to use?
+        DEPLOY_CONFIG.projectSlug, // What slug do you want to use?
         "public", // Who is allowed to access your app?
         true // Do you want to enable continuous deployment?
       );

test/mocks/observableApi.ts

@@ -149,6 +149,7 @@ class ObservableApiMock {
     projectId = "project123",
     title = "Build test case",
     accessLevel = "private",
+    latestCreatedDeployId = null,
     status = 200
   }: {
     workspaceLogin: string;
@@ -157,6 +158,7 @@ class ObservableApiMock {
     title?: string;
     accessLevel?: string;
     status?: number;
+    latestCreatedDeployId?: null | string;
   }): ObservableApiMock {
     const response =
       status === 200
@@ -167,8 +169,8 @@ class ObservableApiMock {
             title,
             creator: {id: "user-id", login: "user-login"},
             owner: {id: "workspace-id", login: "workspace-login"},
-            latestCreatedDeployId: null,
-            automatic_builds_enabled: null,
+            latestCreatedDeployId,
+            automatic_builds_enabled: true,
             build_environment_id: "abc123",
             source: null
           } satisfies GetProjectResponse)
@@ -432,6 +434,66 @@ class ObservableApiMock {
     );
     return this;
   }
+
+  handleGetRepository({status = 200}: {status?: number} = {}) {
+    const response =
+      status === 200
+        ? JSON.stringify({
+            provider: "github",
+            provider_id: "123:456",
+            url: "https://github.com/observablehq/test.git",
+            default_branch: "main",
+            name: "test",
+            linked_projects: []
+          })
+        : 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"}})
+    );
+    return this;
+  }
+
+  handlePostProjectEnvironment({status = 200}: {status?: number} = {}) {
+    const response =
+      status === 200
+        ? JSON.stringify({
+            automatic_builds_enabled: true,
+            build_environment_id: "abc123",
+            source: {
+              provider: "github",
+              provider_id: "123:456",
+              url: "https://github.com/observablehq/test.git",
+              branch: "main"
+            }
+          })
+        : emptyErrorBody;
+    const headers = authorizationHeader(status !== 401);
+    this._handlers.push((pool) =>
+      pool
+        .intercept({path: "/cli/project/project123/environment", method: "POST", headers: headersMatcher(headers)})
+        .reply(status, response, {headers: {"content-type": "application/json"}})
+    );
+    return this;
+  }
+
+  handlePostProjectBuild({status = 200}: {status?: number} = {}) {
+    const response =
+      status === 200
+        ? JSON.stringify({
+            id: "abc123"
+          })
+        : emptyErrorBody;
+    const headers = authorizationHeader(status !== 401);
+    this._handlers.push((pool) =>
+      pool
+        .intercept({path: "/cli/project/project123/build", method: "POST", headers: headersMatcher(headers)})
+        .reply(status, response, {headers: {"content-type": "application/json"}})
+    );
+    return this;
+  }
 }
 
 function authorizationHeader(valid: boolean) {