diff --git a/tests/e2e/login.test.ts b/tests/e2e/login.test.ts index 307f64c52c..c6759f636a 100644 --- a/tests/e2e/login.test.ts +++ b/tests/e2e/login.test.ts @@ -1,5 +1,5 @@ import {test, expect} from '@playwright/test'; -import {login, logout, login_user} from './utils.ts'; +import {login, logout} from './utils.ts'; test('homepage', async ({page}) => { const response = await page.goto('/'); @@ -8,8 +8,9 @@ test('homepage', async ({page}) => { }); test('logged in user', async ({browser}) => { - const context = await login_user(browser, 'e2e'); + const context = await browser.newContext(); const page = await context.newPage(); + await login(page, 'e2e'); const response = await page.goto('/'); expect(response?.status()).toBe(200); }); diff --git a/tests/e2e/utils.ts b/tests/e2e/utils.ts index 3262c3bf87..39d8218be6 100644 --- a/tests/e2e/utils.ts +++ b/tests/e2e/utils.ts @@ -1,12 +1,10 @@ import {expect} from '@playwright/test'; -import type {Browser, Page} from '@playwright/test'; +import type {Page} from '@playwright/test'; -const LOGIN_PASSWORD = 'password'; - -export async function login(page: Page, user: string = 'e2e') { +export async function login(page: Page, user: string = process.env.E2E_USER) { await page.goto('/user/login'); await page.getByLabel('Username or Email Address').fill(user); - await page.getByLabel('Password').fill(LOGIN_PASSWORD); + await page.getByLabel('Password').fill(process.env.E2E_PASSWORD); await page.getByRole('button', {name: 'Sign In'}).click(); await expect(page.getByRole('link', {name: 'Sign In'})).toBeHidden(); } @@ -15,10 +13,3 @@ export async function logout(page: Page) { await page.getByText('Sign Out').dispatchEvent('click'); await expect(page.getByRole('link', {name: 'Sign In'})).toBeVisible(); } - -export async function login_user(browser: Browser, user: string) { - const context = await browser.newContext(); - const page = await context.newPage(); - await login(page, user); - return context; -} diff --git a/tools/test-e2e.sh b/tools/test-e2e.sh index c59ecce458..cdf8047775 100755 --- a/tools/test-e2e.sh +++ b/tools/test-e2e.sh @@ -44,4 +44,6 @@ if ! curl -sf --max-time 5 "$GITEA_TEST_SERVER_URL/api/v1/users/$E2E_USER" > /de fi export GITEA_TEST_SERVER_URL +export E2E_USER +export E2E_PASSWORD exec pnpm exec playwright test "$@"