From 65e906fd07e693fc29c0f439a629a1ccaac5d527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Thu, 25 Jan 2024 10:02:02 +0000 Subject: [PATCH] Bump heartwood version This fixes the landing page not showing local projects anymore. --- httpd-client/lib/project.ts | 2 +- httpd-client/tests/project.test.ts | 2 +- src/views/home/router.ts | 10 ++++++---- src/views/nodes/router.ts | 2 +- tests/e2e/project.spec.ts | 25 +++++++++++++++++-------- tests/e2e/project/patch.spec.ts | 2 +- tests/support/heartwood-version | 2 +- tests/visual/desktop/project.spec.ts | 20 +++++++++++++++++--- 8 files changed, 45 insertions(+), 20 deletions(-) diff --git a/httpd-client/lib/project.ts b/httpd-client/lib/project.ts index a204438b1..9a8c2bfe5 100644 --- a/httpd-client/lib/project.ts +++ b/httpd-client/lib/project.ts @@ -172,7 +172,7 @@ export class Client { } public async getAll( - query?: { page?: number; perPage?: number }, + query?: { page?: number; perPage?: number; show?: "pinned" | "all" }, options?: RequestOptions, ): Promise { return this.#fetcher.fetchOk( diff --git a/httpd-client/tests/project.test.ts b/httpd-client/tests/project.test.ts index dfc4e85b9..9dcd83185 100644 --- a/httpd-client/tests/project.test.ts +++ b/httpd-client/tests/project.test.ts @@ -210,7 +210,7 @@ describe("project", () => { test("#getPatchById(id, patchId)", async () => { await api.project.getPatchById( cobRid, - "7db70f2ed80235db7f0ab9e5537e76572a304991", + "59aa91a1d63a3a1d05292abe6292356a34ea1480", ); }); diff --git a/src/views/home/router.ts b/src/views/home/router.ts index 8b5590e70..0a084db66 100644 --- a/src/views/home/router.ts +++ b/src/views/home/router.ts @@ -27,10 +27,12 @@ export async function loadHomeRoute(): Promise< > { let projects: ProjectBaseUrl[] = []; if (get(httpdStore).state !== "stopped") { - projects = (await api.project.getAll({ perPage: 30 })).map(project => ({ - project, - baseUrl: api.baseUrl, - })); + projects = (await api.project.getAll({ perPage: 30, show: "all" })).map( + project => ({ + project, + baseUrl: api.baseUrl, + }), + ); } else { projects = await getProjectsFromNodes(config.projects.pinned); } diff --git a/src/views/nodes/router.ts b/src/views/nodes/router.ts index 3d01c776e..f0bc95722 100644 --- a/src/views/nodes/router.ts +++ b/src/views/nodes/router.ts @@ -50,7 +50,7 @@ export async function loadProjects( const [nodeStats, projects] = await Promise.all([ api.getStats(), - api.project.getAll({ page, perPage: PROJECTS_PER_PAGE }), + api.project.getAll({ page, perPage: PROJECTS_PER_PAGE, show: "all" }), ]); const results = await Promise.all( diff --git a/tests/e2e/project.spec.ts b/tests/e2e/project.spec.ts index 4d38673a2..10baef2e9 100644 --- a/tests/e2e/project.spec.ts +++ b/tests/e2e/project.spec.ts @@ -49,7 +49,7 @@ test("navigate to project", async ({ page }) => { await expect(page.getByText("Git test repository")).toBeVisible(); // Number of nodes seeding this project. - await expect(page.getByText("Seed 3")).toBeVisible(); + await expect(page.getByText("Seed 4")).toBeVisible(); }); test("show source tree at specific revision", async ({ page }) => { @@ -475,11 +475,20 @@ test("internal file markdown link", async ({ page }) => { }); test("diff selection de-select", async ({ page }) => { - await page.goto( - `${cobUrl}/patches/7db70f2ed80235db7f0ab9e5537e76572a304991?tab=changes#README.md:H0L0H0L3`, - ); - await page.getByText("Add subtitle to README").click(); - await expect(page).toHaveURL( - `${cobUrl}/patches/7db70f2ed80235db7f0ab9e5537e76572a304991?tab=changes`, - ); + await page.goto(`${cobUrl}/patches`); + await page + .getByRole("link", { name: "Taking another stab at the README" }) + .click(); + await page.getByRole("link", { name: "Changes" }).click(); + await page + .getByRole("row", { name: "+ # Cobs Repo" }) + .locator("div") + .first() + .click(); + await expect(page).toHaveURL(new RegExp("tab=changes#README.md:H0L1$")); + // Click outside. + await page + .getByText("1 file changed with 5 insertions and 1 deletion") + .click(); + await expect(page).toHaveURL(new RegExp("tab=changes$")); }); diff --git a/tests/e2e/project/patch.spec.ts b/tests/e2e/project/patch.spec.ts index e10c4792e..8d321eeaf 100644 --- a/tests/e2e/project/patch.spec.ts +++ b/tests/e2e/project/patch.spec.ts @@ -59,7 +59,7 @@ test("navigate through revision diffs", async ({ page }) => { .click(); const firstRevision = page.locator(".revision").first(); - const firstRevisionId = "a27a6b7"; + const firstRevisionId = "59aa91a"; const secondRevision = page.locator(".revision").nth(1); // Second revision diff --git a/tests/support/heartwood-version b/tests/support/heartwood-version index a43fe949b..46f3d13ef 100644 --- a/tests/support/heartwood-version +++ b/tests/support/heartwood-version @@ -1 +1 @@ -5dbd9bb2a32dca6aafbd2b4a50dd73d237ca025d \ No newline at end of file +49584f4e732fb0039d2089f3c39fd56fc34a2ee3 diff --git a/tests/visual/desktop/project.spec.ts b/tests/visual/desktop/project.spec.ts index c329326c5..c578ba209 100644 --- a/tests/visual/desktop/project.spec.ts +++ b/tests/visual/desktop/project.spec.ts @@ -64,9 +64,23 @@ test("diff selection", async ({ page }) => { }; }); - await page.goto( - `${cobUrl}/patches/a27a6b77246e6ada5e81bc8764b5f5c593be80a5?tab=changes#README.md:H0L0H0L3`, - ); + await page.goto(`${cobUrl}/patches`); + await page + .getByRole("link", { name: "Taking another stab at the README" }) + .click(); + await page.getByRole("link", { name: "Changes" }).click(); + await page + .getByRole("row", { name: "- # Cobs Repo" }) + .locator("div") + .first() + .click(); + await page.keyboard.down("Shift"); + await page + .getByRole("row", { name: "+ ## Better?" }) + .locator("div") + .first() + .click(); + await page.keyboard.up("Shift"); await expect(page).toHaveScreenshot({ fullPage: true }); });