loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request 'fix(ui): prevent exceptions on other users' repo migration pages' (#4875) from solomonv/forgejo:fix-migration-guest-exception into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4875
Reviewed-by: Caesar Schinas <caesar@caesarschinas.com>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>

Gusted 4f549183 78e4736d

+34 -1
+32
tests/e2e/repo-migrate.test.e2e.js
··· 1 + // @ts-check 2 + import {expect} from '@playwright/test'; 3 + import {test, login_user, load_logged_in_context} from './utils_e2e.js'; 4 + 5 + test.beforeAll(({browser}, workerInfo) => login_user(browser, workerInfo, 'user2')); 6 + 7 + test('Migration Progress Page', async ({page: unauthedPage, browser}, workerInfo) => { 8 + test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari'); 9 + 10 + const page = await (await load_logged_in_context(browser, workerInfo, 'user2')).newPage(); 11 + 12 + await expect((await page.goto('/user2/invalidrepo'))?.status(), 'repo should not exist yet').toBe(404); 13 + 14 + await page.goto('/repo/migrate?service_type=1'); 15 + 16 + const form = page.locator('form'); 17 + await form.getByRole('textbox', {name: 'Repository Name'}).fill('invalidrepo'); 18 + await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://codeberg.org/forgejo/invalidrepo'); 19 + await form.locator('button.primary').click({timeout: 5000}); 20 + await expect(page).toHaveURL('user2/invalidrepo'); 21 + 22 + await expect((await unauthedPage.goto('/user2/invalidrepo'))?.status(), 'public migration page should be accessible').toBe(200); 23 + await expect(unauthedPage.locator('#repo_migrating_progress')).toBeVisible(); 24 + 25 + await page.reload(); 26 + await expect(page.locator('#repo_migrating_failed')).toBeVisible(); 27 + await page.getByRole('button', {name: 'Delete this repository'}).click(); 28 + const deleteModal = page.locator('#delete-repo-modal'); 29 + await deleteModal.getByRole('textbox', {name: 'Confirmation string'}).fill('user2/invalidrepo'); 30 + await deleteModal.getByRole('button', {name: 'Delete repository'}).click(); 31 + await expect(page).toHaveURL('/'); 32 + });
+2 -1
web_src/js/features/repo-migrate.js
··· 7 7 const repoMigrating = document.getElementById('repo_migrating'); 8 8 if (!repoMigrating) return; 9 9 10 - document.getElementById('repo_migrating_retry').addEventListener('click', doMigrationRetry); 10 + document.getElementById('repo_migrating_retry')?.addEventListener('click', doMigrationRetry); 11 11 12 12 const task = repoMigrating.getAttribute('data-migrating-task-id'); 13 13 14 14 // returns true if the refresh still needs to be called after a while 15 15 const refresh = async () => { 16 16 const res = await GET(`${appSubUrl}/user/task/${task}`); 17 + if (res.url.endsWith('/login')) return false; // stop refreshing if redirected to login 17 18 if (res.status !== 200) return true; // continue to refresh if network error occurs 18 19 19 20 const data = await res.json();