new test for when repo doesnt match

Author: Observable User

test/deploy-test.ts

@@ -14,7 +14,7 @@ import type {ObservableApiClientOptions, PostDeployUploadedRequest} from "../src
 import type {GetCurrentUserResponse} from "../src/observableApiClient.js";
 import {ObservableApiClient} from "../src/observableApiClient.js";
 import type {DeployConfig} from "../src/observableApiConfig.js";
-import {stripColor} from "../src/tty.js";
+import {link, stripColor} from "../src/tty.js";
 import {MockAuthEffects} from "./mocks/authEffects.js";
 import {TestClackEffects} from "./mocks/clack.js";
 import {MockConfigEffects} from "./mocks/configEffects.js";
@@ -207,7 +207,7 @@ describe("deploy", () => {
   describe("in isolated directory with git repo", () => {
     mockIsolatedDirectory({git: true});
 
-    it("fails continuous deployment if repo has no GitHub remote", async () => {
+    it("fails cloud build if repo has no GitHub remote", async () => {
       getCurrentObservableApi()
         .handleGetCurrentUser()
         .handleGetWorkspaceProjects({
@@ -234,7 +234,39 @@ describe("deploy", () => {
       effects.close();
     });
 
-    it("starts cloud build when continuous deployment is enabled and repo is valid", async () => {
+    it("fails cloud build if repo doesn’t match", async () => {
+      getCurrentObservableApi()
+        .handleGetCurrentUser()
+        .handleGetProject({
+          ...DEPLOY_CONFIG,
+          source: {
+            provider: "github",
+            provider_id: "123:456",
+            url: "https://github.com/observablehq/test.git",
+            branch: "main"
+          },
+          latestCreatedDeployId: null
+        })
+        .handleGetRepository({ownerName: "observablehq", repoName: "wrongrepo", provider_id: "000:001"})
+        .start();
+      const effects = new MockDeployEffects({deployConfig: {...DEPLOY_CONFIG, continuousDeployment: true}});
+
+      await (await open("readme.md", "a")).close();
+      await promisify(exec)(
+        "git add . && git commit -m 'initial' && git remote add origin git@github.com:observablehq/wrongrepo.git"
+      );
+
+      try {
+        await deploy(TEST_OPTIONS, effects);
+        assert.fail("expected error");
+      } catch (error) {
+        CliError.assert(error, {message: `Configured repository does not match local repository; check build settings on ${link(`https://observablehq.com/projects/@${DEPLOY_CONFIG.workspaceLogin}/${DEPLOY_CONFIG.projectSlug}/settings`)}`});
+      }
+
+      effects.close();
+    });
+
+    it("starts cloud build when continuous deployment is enabled for new project and repo is valid", async () => {
       const deployId = "deploy123";
       getCurrentObservableApi()
         .handleGetCurrentUser()
@@ -282,6 +314,7 @@ describe("deploy", () => {
           },
           latestCreatedDeployId: null
         })
+        .handleGetRepository({useProviderId: false})
         .handleGetRepository({useProviderId: true})
         .handlePostProjectBuild()
         .handleGetProject({
@@ -297,9 +330,6 @@ describe("deploy", () => {
         .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 (await open("readme.md", "a")).close();
       await promisify(exec)(
@@ -315,7 +345,7 @@ describe("deploy", () => {
   describe("in isolated directory without git repo", () => {
     mockIsolatedDirectory({git: false});
 
-    it("fails continuous deployment if not in a git repo", async () => {
+    it("fails cloud build if not in a git repo", async () => {
       getCurrentObservableApi()
         .handleGetCurrentUser()
         .handleGetWorkspaceProjects({

test/mocks/observableApi.ts

@@ -437,13 +437,19 @@ class ObservableApiMock {
     return this;
   }
 
-  handleGetRepository({status = 200, useProviderId = false}: {status?: number; useProviderId?: boolean} = {}) {
+  handleGetRepository({
+    status = 200,
+    ownerName = "observablehq",
+    repoName = "test",
+    provider_id = "123:456",
+    useProviderId = false
+  }: {status?: number; ownerName?: string; repoName?: string; provider_id?: string; useProviderId?: boolean} = {}) {
     const response =
       status === 200
         ? JSON.stringify({
             provider: "github",
-            provider_id: "123:456",
-            url: "https://github.com/observablehq/test.git",
+            provider_id,
+            url: `https://github.com/${ownerName}/${repoName}.git`,
             default_branch: "main",
             name: "test",
             linked_projects: []
@@ -455,7 +461,7 @@ class ObservableApiMock {
       this._handlers.push((pool) =>
         pool
           .intercept({
-            path: `/cli/github/repository?provider_id=${encodeURIComponent("123:456")}`,
+            path: `/cli/github/repository?provider_id=${encodeURIComponent(provider_id)}`,
             headers: headersMatcher(headers)
           })
           .reply(status, response, {headers: {"content-type": "application/json"}})
@@ -464,7 +470,10 @@ class ObservableApiMock {
       // version that accepts owner & repo
       this._handlers.push((pool) =>
         pool
-          .intercept({path: "/cli/github/repository?owner=observablehq&repo=test", headers: headersMatcher(headers)})
+          .intercept({
+            path: `/cli/github/repository?owner=${ownerName}&repo=${repoName}`,
+            headers: headersMatcher(headers)
+          })
           .reply(status, response, {headers: {"content-type": "application/json"}})
       );
     }