Skip to content

Commit 6c7f86e

Browse files
committed
test(azure): preserve viewer fallback after connection data failure
1 parent c201c64 commit 6c7f86e

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

‎packages/source-control-azure-devops/src/server/AzureDevOpsPullRequestCli.test.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,25 @@ layer("AzureDevOpsPullRequestCli.layer", (it) => {
278278
}),
279279
);
280280

281+
it.effect("retains the extension viewer fallback when connection data is unavailable", () =>
282+
Effect.gen(function* () {
283+
mockedExecute.mockReturnValueOnce(Effect.succeed(output("{}"))).mockReturnValueOnce(
284+
Effect.succeed(
285+
output(
286+
JSON.stringify([
287+
{
288+
...pullRequestRow,
289+
createdBy: { id: "fallback-id", uniqueName: "[email protected]" },
290+
},
291+
]),
292+
),
293+
),
294+
);
295+
const cli = yield* AzureDevOpsPullRequestCli.AzureDevOpsPullRequestCli;
296+
assert.strictEqual(yield* cli.getViewer({ cwd: "/w" }), "[email protected]");
297+
}),
298+
);
299+
281300
it.effect("does not substitute an identity id for a missing account login", () =>
282301
Effect.gen(function* () {
283302
mockedExecute.mockReturnValueOnce(
@@ -289,6 +308,7 @@ layer("AzureDevOpsPullRequestCli.layer", (it) => {
289308
),
290309
),
291310
);
311+
mockedExecute.mockReturnValueOnce(Effect.succeed(output("[]")));
292312
const cli = yield* AzureDevOpsPullRequestCli.AzureDevOpsPullRequestCli;
293313
const error = yield* Effect.flip(cli.getViewer({ cwd: "/w" }));
294314
assert.strictEqual(error._tag, "AzureDevOpsViewerUnavailableError");
@@ -306,6 +326,7 @@ layer("AzureDevOpsPullRequestCli.layer", (it) => {
306326
),
307327
),
308328
);
329+
mockedExecute.mockReturnValueOnce(Effect.succeed(output("[]")));
309330
const cli = yield* AzureDevOpsPullRequestCli.AzureDevOpsPullRequestCli;
310331
const error = yield* Effect.flip(cli.getViewer({ cwd: "/w" }));
311332
assert.strictEqual(error._tag, "AzureDevOpsViewerUnavailableError");

‎packages/source-control-azure-devops/src/server/AzureDevOpsPullRequestCli.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ export const make = Effect.gen(function* () {
464464
? Effect.succeed(viewer.account)
465465
: Effect.fail(new AzureDevOpsViewerUnavailableError({ command: "az", cwd: input.cwd }));
466466
}),
467-
// `az account show` cannot identify PAT logins; the extension resolves `--creator me`.
467+
// The extension can identify its current actor if connectionData is unavailable.
468468
Effect.catchIf(
469469
(error) => error._tag !== "AzureDevOpsCliUnavailableError",
470470
() =>

0 commit comments

Comments
 (0)