From 3c72bfad48eb1eb2aaab6a8516fcec6f23658a35 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Thu, 30 Nov 2023 22:26:01 +0100 Subject: [PATCH] Update `createProject` test support function To pass in more specific props, it's nicer to have it as an opts object. --- tests/e2e/project/assignees.spec.ts | 7 +++---- tests/e2e/project/commits.spec.ts | 4 +++- tests/e2e/project/issue.spec.ts | 23 ++++++++++------------- tests/e2e/project/issues.spec.ts | 11 ++++++----- tests/e2e/project/labels.spec.ts | 7 +++---- tests/e2e/project/patch.spec.ts | 14 ++++++-------- tests/e2e/project/patches.spec.ts | 2 +- tests/e2e/project/threads.spec.ts | 21 +++++++++------------ tests/support/fixtures.ts | 6 ++++-- tests/support/project.ts | 16 ++++++++++++---- 10 files changed, 57 insertions(+), 54 deletions(-) diff --git a/tests/e2e/project/assignees.spec.ts b/tests/e2e/project/assignees.spec.ts index a83e3d6ec..c69c6ba8f 100644 --- a/tests/e2e/project/assignees.spec.ts +++ b/tests/e2e/project/assignees.spec.ts @@ -3,10 +3,9 @@ import { createProject } from "@tests/support/project"; test("add and remove assignees", async ({ page, authenticatedPeer }) => { await page.goto(authenticatedPeer.uiUrl()); - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "handle-assignees", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "handle-assignees", + }); await authenticatedPeer.rad( [ "issue", diff --git a/tests/e2e/project/commits.spec.ts b/tests/e2e/project/commits.spec.ts index f546bfbec..5b4dd164a 100644 --- a/tests/e2e/project/commits.spec.ts +++ b/tests/e2e/project/commits.spec.ts @@ -132,7 +132,9 @@ test("pushing changes while viewing history", async ({ page, peerManager }) => { }); await alice.startHttpd(); await alice.startNode(); - const { rid, projectFolder } = await createProject(alice, "alice-project"); + const { rid, projectFolder } = await createProject(alice, { + name: "alice-project", + }); await page.goto(`${alice.uiUrl()}/${rid}`); await page.getByRole("link", { name: "1 commit" }).click(); await expect(page).toHaveURL(`${alice.uiUrl()}/${rid}/history`); diff --git a/tests/e2e/project/issue.spec.ts b/tests/e2e/project/issue.spec.ts index cdfa7ce0d..6450de1c7 100644 --- a/tests/e2e/project/issue.spec.ts +++ b/tests/e2e/project/issue.spec.ts @@ -13,10 +13,9 @@ test("navigate single issue", async ({ page }) => { }); test("test issue editing failing", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "issue-editing", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "issue-editing", + }); await authenticatedPeer.rad( [ "issue", @@ -47,10 +46,9 @@ test("test issue editing failing", async ({ page, authenticatedPeer }) => { test("edit issue", async ({ page, authenticatedPeer }) => { await page.goto(authenticatedPeer.uiUrl()); - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "edit-issue", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "edit-issue", + }); await authenticatedPeer.rad( [ "issue", @@ -110,10 +108,9 @@ test("edit issue", async ({ page, authenticatedPeer }) => { }); test("add and remove reactions", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "handle-reactions", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "handle-reactions", + }); await authenticatedPeer.rad( [ "issue", @@ -133,7 +130,7 @@ test("add and remove reactions", async ({ page, authenticatedPeer }) => { }); test("handling embeds", async ({ page, authenticatedPeer }) => { - const { rid } = await createProject(authenticatedPeer, "embeds"); + const { rid } = await createProject(authenticatedPeer, { name: "embeds" }); await page.goto( `/nodes/${authenticatedPeer.httpdBaseUrl.hostname}:${authenticatedPeer.httpdBaseUrl.port}/${rid}/issues/new`, ); diff --git a/tests/e2e/project/issues.spec.ts b/tests/e2e/project/issues.spec.ts index aa4bbf6ac..6789b2911 100644 --- a/tests/e2e/project/issues.spec.ts +++ b/tests/e2e/project/issues.spec.ts @@ -12,10 +12,9 @@ test("navigate issue listing", async ({ page }) => { }); test("issue counters", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "issue-counters", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "issue-counters", + }); await authenticatedPeer.rad( [ "issue", @@ -55,7 +54,9 @@ test("issue counters", async ({ page, authenticatedPeer }) => { }); test("create a new issue", async ({ page, authenticatedPeer }) => { - const { rid } = await createProject(authenticatedPeer, "commenting"); + const { rid } = await createProject(authenticatedPeer, { + name: "commenting", + }); await page.goto( `/nodes/${authenticatedPeer.httpdBaseUrl.hostname}:${authenticatedPeer.httpdBaseUrl.port}/${rid}`, diff --git a/tests/e2e/project/labels.spec.ts b/tests/e2e/project/labels.spec.ts index 5164b3554..95c2c0cbd 100644 --- a/tests/e2e/project/labels.spec.ts +++ b/tests/e2e/project/labels.spec.ts @@ -6,10 +6,9 @@ import { } from "@tests/support/project"; test("add and remove labels", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "handle-labels", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "handle-labels", + }); await authenticatedPeer.rad( [ "issue", diff --git a/tests/e2e/project/patch.spec.ts b/tests/e2e/project/patch.spec.ts index 012028e6b..353120474 100644 --- a/tests/e2e/project/patch.spec.ts +++ b/tests/e2e/project/patch.spec.ts @@ -135,10 +135,9 @@ test("view file navigation from changes tab", async ({ page }) => { }); test("change patch state", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "lifecycle", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "lifecycle", + }); await authenticatedPeer.git(["switch", "-c", "feature-1"], { cwd: projectFolder, }); @@ -166,10 +165,9 @@ test("change patch state", async ({ page, authenticatedPeer }) => { }); test("edit patch", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "edit-patch", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "edit-patch", + }); await authenticatedPeer.git(["switch", "-c", "edit-patch"], { cwd: projectFolder, }); diff --git a/tests/e2e/project/patches.spec.ts b/tests/e2e/project/patches.spec.ts index ef225635c..7d015098b 100644 --- a/tests/e2e/project/patches.spec.ts +++ b/tests/e2e/project/patches.spec.ts @@ -17,7 +17,7 @@ test("navigate patch listing", async ({ page }) => { test("patches counters", async ({ page, authenticatedPeer }) => { const { rid, projectFolder, defaultBranch } = await createProject( authenticatedPeer, - "patch-counters", + { name: "patch-counters" }, ); await authenticatedPeer.git(["switch", "-c", "feature-1"], { cwd: projectFolder, diff --git a/tests/e2e/project/threads.spec.ts b/tests/e2e/project/threads.spec.ts index 3cecf8546..fcfcf0842 100644 --- a/tests/e2e/project/threads.spec.ts +++ b/tests/e2e/project/threads.spec.ts @@ -8,10 +8,9 @@ import { } from "@tests/support/project"; test("leave comments and replies", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "commenting", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "commenting", + }); await authenticatedPeer.rad( [ "issue", @@ -50,10 +49,9 @@ test("leave comments and replies", async ({ page, authenticatedPeer }) => { }); test("add and remove reactions", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "reactions", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "reactions", + }); await authenticatedPeer.git(["switch", "-c", "feature-1"], { cwd: projectFolder, }); @@ -73,10 +71,9 @@ test("add and remove reactions", async ({ page, authenticatedPeer }) => { }); test("handling embeds", async ({ page, authenticatedPeer }) => { - const { rid, projectFolder } = await createProject( - authenticatedPeer, - "embeds", - ); + const { rid, projectFolder } = await createProject(authenticatedPeer, { + name: "embeds", + }); await authenticatedPeer.rad( [ "issue", diff --git a/tests/support/fixtures.ts b/tests/support/fixtures.ts index 954141764..e76585a71 100644 --- a/tests/support/fixtures.ts +++ b/tests/support/fixtures.ts @@ -369,7 +369,9 @@ export async function createSourceBrowsingFixture( export async function createCobsFixture(peer: RadiclePeer) { await peer.rad(["track", peer.nodeId, "--alias", "palm"]); await Fs.mkdir(Path.join(tmpDir, "repos", "cobs")); - const { projectFolder, defaultBranch } = await createProject(peer, "cobs"); + const { projectFolder, defaultBranch } = await createProject(peer, { + name: "cobs", + }); const issueOne = await issue.create( peer, "This `title` has **markdown**", @@ -644,7 +646,7 @@ export async function createMarkdownFixture(peer: RadiclePeer) { "-C", Path.join(tmpDir, "repos", "markdown"), ]); - const { projectFolder } = await createProject(peer, "markdown"); + const { projectFolder } = await createProject(peer, { name: "markdown" }); await Fs.cp(Path.join(tmpDir, "repos", "markdown"), projectFolder, { recursive: true, }); diff --git a/tests/support/project.ts b/tests/support/project.ts index 2a6219329..b3b2484ff 100644 --- a/tests/support/project.ts +++ b/tests/support/project.ts @@ -9,9 +9,17 @@ import { readFileSync } from "node:fs"; // Create a project using the rad CLI. export async function createProject( peer: RadiclePeer, - name: string, - description = "", - defaultBranch = "main", + { + name, + description = "", + defaultBranch = "main", + visibility = "public", + }: { + name: string; + description?: string; + defaultBranch?: string; + visibility?: "public" | "private"; + }, ): Promise<{ rid: string; projectFolder: string; defaultBranch: string }> { const projectFolder = Path.join(peer.checkoutPath, name); @@ -30,7 +38,7 @@ export async function createProject( defaultBranch, "--description", description, - "--public", + `--${visibility}`, ], { cwd: projectFolder,