tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge pull request '[v8.0/forgejo] Fix branch selector in commit graph' (#4413) from bp-v8.0/forgejo-11ff38d into v8.0/forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4413
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Beowulf <beowulf@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-07-09 12:08:49 +00:00
commit 2339bfa0a0
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/e2e/commit-graph-branch-selector.test.e2e.js Normal file
View file

@ -0,0 +1,25 @@
// @ts-check
import {test, expect} from '@playwright/test';
import {login_user, load_logged_in_context} from './utils_e2e.js';
test.beforeAll(async ({browser}, workerInfo) => {
await login_user(browser, workerInfo, 'user2');
});
test('Switch branch', async ({browser}, workerInfo) => {
const context = await load_logged_in_context(browser, workerInfo, 'user2');
const page = await context.newPage();
const response = await page.goto('/user2/repo1/graph');
await expect(response?.status()).toBe(200);
await page.click('#flow-select-refs-dropdown');
const input = page.locator('#flow-select-refs-dropdown');
await input.pressSequentially('develop', {delay: 50});
await input.press('Enter');
await page.waitForLoadState('networkidle');
await expect(page.locator('#loading-indicator')).not.toBeVisible();
await expect(page.locator('#rel-container')).toBeVisible();
await expect(page.locator('#rev-container')).toBeVisible();
});

6
web_src/js/features/repo-graph.js
View file

@ -69,9 +69,9 @@ export function initRepoGraphGit() {
const html = await response.text(); const html = await response.text();
const div = document.createElement('div'); const div = document.createElement('div');
div.innerHTML = html; div.innerHTML = html;
document.getElementById('pagination').innerHTML = div.getElementById('pagination').innerHTML; document.getElementById('pagination').innerHTML = div.querySelector('#pagination').innerHTML;
document.getElementById('rel-container').innerHTML = div.getElementById('rel-container').innerHTML; document.getElementById('rel-container').innerHTML = div.querySelector('#rel-container').innerHTML;
document.getElementById('rev-container').innerHTML = div.getElementById('rev-container').innerHTML; document.getElementById('rev-container').innerHTML = div.querySelector('#rev-container').innerHTML;
hideElem('#loading-indicator'); hideElem('#loading-indicator');
showElem('#rel-container'); showElem('#rel-container');
showElem('#rev-container'); showElem('#rev-container');