From 39b687ce5e829068cbe05a1dc88f66a3923b50b7 Mon Sep 17 00:00:00 2001 From: Aidan Jones Date: Wed, 5 Nov 2025 10:09:47 -0600 Subject: [PATCH 1/5] test: read local .env for testing --- playwright.config.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/playwright.config.ts b/playwright.config.ts index 589bf8977e..97910b4293 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -1,5 +1,12 @@ import type { PlaywrightTestConfig } from '@playwright/test'; import { randomBytes } from 'crypto'; +import dotenv from 'dotenv'; + +if (process.env.NODE_ENV === 'development') { + console.log(`NODE_ENV=${process.env.NODE_ENV}`); + console.log('Using local .env file...'); + dotenv.config({ path: '.env' }); +} const signingSecret = randomBytes(32).toString('hex'); From cb8d80750628945a1ceea3f96433d3fd802faf7b Mon Sep 17 00:00:00 2001 From: Aidan Jones Date: Wed, 5 Nov 2025 10:10:39 -0600 Subject: [PATCH 2/5] test: add CI as author to alt org --- src/lib/prisma/seed.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/prisma/seed.ts b/src/lib/prisma/seed.ts index b4fea1dae7..fe66fe0f9d 100644 --- a/src/lib/prisma/seed.ts +++ b/src/lib/prisma/seed.ts @@ -532,6 +532,7 @@ async function main() { { UserId: 4, OrganizationId: 1 }, // loren_hawthorne@sil.org - SIL { UserId: 5, OrganizationId: 2 }, // chris.kalaam@gmail.com - Kalaam { UserId: 6, OrganizationId: 1 }, // Scriptoria CI - SIL + { UserId: 6, OrganizationId: 2 }, // Scriptoria CI - Kalaam { UserId: 7, OrganizationId: 1 }, // 7dev7urandom@gmail.com - SIL { UserId: 8, OrganizationId: 1 } // aejones4gm@gmail.com - SIL ]; @@ -572,6 +573,7 @@ async function main() { { UserId: 4, RoleId: 3, OrganizationId: 1 }, // loren_hawthorne@sil.org - AppBuilder - SIL { UserId: 5, RoleId: 3, OrganizationId: 3 }, // chris.kalaam@gmail.com - AppBuilder - Kalaam { UserId: 6, RoleId: 2, OrganizationId: 1 }, // CI - OrgAdmin - SIL (this is so CI can send an invite email) + { UserId: 6, RoleId: 4, OrganizationId: 2 }, // CI - Author - Kalaam (this is so CI can test OrgAdmin permissions) { UserId: 7, RoleId: 1, OrganizationId: 1 }, // 7dev7urandom@gmail.com - SuperAdmin - SIL { UserId: 8, RoleId: 1, OrganizationId: 1 } // aejones4gm@gmail.com - SuperAdmin - SIL ]; From 8ace1aadc340eeafb7a680b2e43b9726eecfe1ec Mon Sep 17 00:00:00 2001 From: Aidan Jones Date: Wed, 5 Nov 2025 11:39:57 -0600 Subject: [PATCH 3/5] test: fix sidebar layout --- src/routes/(authenticated)/+layout.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/(authenticated)/+layout.svelte b/src/routes/(authenticated)/+layout.svelte index 356c459db9..1f9bb174d2 100644 --- a/src/routes/(authenticated)/+layout.svelte +++ b/src/routes/(authenticated)/+layout.svelte @@ -110,7 +110,7 @@ bind:this={drawerToggle} /> -
+
From 69792a987b383f33acfa683d2989e0cb2df3b18d Mon Sep 17 00:00:00 2001 From: Aidan Jones Date: Wed, 5 Nov 2025 11:40:18 -0600 Subject: [PATCH 4/5] test: switch org --- tests/test.ts | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/tests/test.ts b/tests/test.ts index 2698531e53..f92e66c886 100644 --- a/tests/test.ts +++ b/tests/test.ts @@ -21,7 +21,7 @@ test.describe('Create a Test Project', () => { test('Go to New Projects', async () => { // go to new projects page - await page.goto('/projects/new/1'); + await page.goto('/projects/new/1'); // this will set $orgActive to 1 await expect(page.getByRole('heading', { name: 'New Project' })).toBeVisible(); }); @@ -107,3 +107,30 @@ test.describe('Create a Test Project', () => { // TODO: test BuildEngine stuff }); + +// see issue #1368 +test.describe('No admin perms in other org', () => { + // skip tests if earlier one fails + test.describe.configure({ mode: 'serial' }); + let page: Page; + test.beforeAll(async ({ browser }) => { + page = await browser.newPage(); + }); + + test('Select Org', async () => { + await page.goto('/'); + // Wait for the page to load + await expect(page.getByRole('heading', { name: 'My Tasks' })).toBeVisible(); + const orgSelector = page + .getByRole('complementary') + .getByRole('heading', { name: /(SIL International|Kalaam Media|All Organizations)/ }); + await expect(orgSelector).toBeVisible(); + // $orgActive is set to 1 by Create a Test Project, switch just in case + if (!(await orgSelector.textContent())?.match(/SIL International/)) { + await orgSelector.click(); + await page.getByRole('button', { name: 'SIL International' }).click(); + } + + await expect(orgSelector).toContainText('SIL International'); + }); +}); From 709f25c62bb74a0739a5e6629f7625545597ccb2 Mon Sep 17 00:00:00 2001 From: Aidan Jones Date: Thu, 6 Nov 2025 11:10:19 -0600 Subject: [PATCH 5/5] test: switching org still isn't working... Co-Authored-By: Aidan Jones --- tests/test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test.ts b/tests/test.ts index f92e66c886..978fb5ac61 100644 --- a/tests/test.ts +++ b/tests/test.ts @@ -123,12 +123,14 @@ test.describe('No admin perms in other org', () => { await expect(page.getByRole('heading', { name: 'My Tasks' })).toBeVisible(); const orgSelector = page .getByRole('complementary') - .getByRole('heading', { name: /(SIL International|Kalaam Media|All Organizations)/ }); + .getByRole('button', { name: /(SIL International|Kalaam Media|All Organizations)/ }); await expect(orgSelector).toBeVisible(); // $orgActive is set to 1 by Create a Test Project, switch just in case if (!(await orgSelector.textContent())?.match(/SIL International/)) { await orgSelector.click(); - await page.getByRole('button', { name: 'SIL International' }).click(); + const button = page.getByRole('button', { name: 'SIL International' }); + await expect(button).toBeVisible(); + await button.click(); } await expect(orgSelector).toContainText('SIL International');