mirror of
https://github.com/go-gitea/gitea.git
synced 2026-04-02 00:18:35 +01:00
Enable concurrent vitest execution (#36998)
Enable [`sequence.concurrent`](https://vitest.dev/config/sequence.html#sequence-concurrent) to run all js tests in parallel. This will help catch potential concurrency bugs in the future. The "Repository Branch Settings" test was not concurrency-safe, it was refactored to remove shared mutable state. Co-Authored-By: Claude (claude-opus-4-6) <noreply@anthropic.com> --------- Co-authored-by: Claude (claude-opus-4-6) <noreply@anthropic.com>
This commit is contained in:
@@ -14,6 +14,9 @@ export default defineConfig({
|
|||||||
globals: true,
|
globals: true,
|
||||||
watch: false,
|
watch: false,
|
||||||
isolate: false,
|
isolate: false,
|
||||||
|
sequence: {
|
||||||
|
concurrent: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
stringPlugin(),
|
stringPlugin(),
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import {initRepoSettingsBranchesDrag} from './repo-settings-branches.ts';
|
import {initRepoSettingsBranchesDrag} from './repo-settings-branches.ts';
|
||||||
import {POST} from '../modules/fetch.ts';
|
import {POST} from '../modules/fetch.ts';
|
||||||
import {createSortable} from '../modules/sortable.ts';
|
import {createSortable} from '../modules/sortable.ts';
|
||||||
import type {SortableEvent, SortableOptions} from 'sortablejs';
|
import type {SortableEvent} from 'sortablejs';
|
||||||
import type Sortable from 'sortablejs';
|
|
||||||
|
|
||||||
vi.mock('../modules/fetch.ts', () => ({
|
vi.mock('../modules/fetch.ts', () => ({
|
||||||
POST: vi.fn(),
|
POST: vi.fn(),
|
||||||
@@ -12,63 +11,48 @@ vi.mock('../modules/sortable.ts', () => ({
|
|||||||
createSortable: vi.fn(),
|
createSortable: vi.fn(),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const branchesHTML = `
|
||||||
|
<div id="protected-branches-list" data-update-priority-url="some/repo/branches/priority">
|
||||||
|
<div class="flex-item tw-items-center item" data-id="1">
|
||||||
|
<div class="drag-handle"></div>
|
||||||
|
</div>
|
||||||
|
<div class="flex-item tw-items-center item" data-id="2">
|
||||||
|
<div class="drag-handle"></div>
|
||||||
|
</div>
|
||||||
|
<div class="flex-item tw-items-center item" data-id="3">
|
||||||
|
<div class="drag-handle"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
describe('Repository Branch Settings', () => {
|
describe('Repository Branch Settings', () => {
|
||||||
beforeEach(() => {
|
|
||||||
document.body.innerHTML = `
|
|
||||||
<div id="protected-branches-list" data-update-priority-url="some/repo/branches/priority">
|
|
||||||
<div class="flex-item tw-items-center item" data-id="1" >
|
|
||||||
<div class="drag-handle"></div>
|
|
||||||
</div>
|
|
||||||
<div class="flex-item tw-items-center item" data-id="2" >
|
|
||||||
<div class="drag-handle"></div>
|
|
||||||
</div>
|
|
||||||
<div class="flex-item tw-items-center item" data-id="3" >
|
|
||||||
<div class="drag-handle"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should initialize sortable for protected branches list', () => {
|
test('should initialize sortable for protected branches list', () => {
|
||||||
|
document.body.innerHTML = branchesHTML;
|
||||||
|
const callsBefore = vi.mocked(createSortable).mock.calls.length;
|
||||||
initRepoSettingsBranchesDrag();
|
initRepoSettingsBranchesDrag();
|
||||||
|
const newCalls = vi.mocked(createSortable).mock.calls.slice(callsBefore);
|
||||||
expect(createSortable).toHaveBeenCalledWith(
|
expect(newCalls).toHaveLength(1);
|
||||||
document.querySelector('#protected-branches-list'),
|
expect(newCalls[0][0]).toBe(document.querySelector('#protected-branches-list'));
|
||||||
expect.objectContaining({
|
expect(newCalls[0][1]).toMatchObject({handle: '.drag-handle', animation: 150});
|
||||||
handle: '.drag-handle',
|
|
||||||
animation: 150,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should not initialize if protected branches list is not present', () => {
|
test('should not initialize if protected branches list is not present', () => {
|
||||||
document.body.innerHTML = '';
|
document.querySelector('#protected-branches-list')?.remove();
|
||||||
|
const callsBefore = vi.mocked(createSortable).mock.calls.length;
|
||||||
initRepoSettingsBranchesDrag();
|
initRepoSettingsBranchesDrag();
|
||||||
|
expect(vi.mocked(createSortable).mock.calls.length).toBe(callsBefore);
|
||||||
expect(createSortable).not.toHaveBeenCalled();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should post new order after sorting', async () => {
|
test('should post new order after sorting', () => {
|
||||||
|
document.body.innerHTML = branchesHTML;
|
||||||
vi.mocked(POST).mockResolvedValue({ok: true} as Response);
|
vi.mocked(POST).mockResolvedValue({ok: true} as Response);
|
||||||
|
const callsBefore = vi.mocked(createSortable).mock.calls.length;
|
||||||
// Mock createSortable to capture and execute the onEnd callback
|
|
||||||
vi.mocked(createSortable).mockImplementation(async (_el: HTMLElement, options: SortableOptions | undefined) => {
|
|
||||||
if (options?.onEnd) {
|
|
||||||
options.onEnd(new Event('SortableEvent') as SortableEvent);
|
|
||||||
}
|
|
||||||
return {destroy: vi.fn()} as unknown as Sortable;
|
|
||||||
});
|
|
||||||
|
|
||||||
initRepoSettingsBranchesDrag();
|
initRepoSettingsBranchesDrag();
|
||||||
|
const onEnd = vi.mocked(createSortable).mock.calls[callsBefore][1]!.onEnd!;
|
||||||
|
onEnd(new Event('SortableEvent') as SortableEvent);
|
||||||
expect(POST).toHaveBeenCalledWith(
|
expect(POST).toHaveBeenCalledWith(
|
||||||
'some/repo/branches/priority',
|
'some/repo/branches/priority',
|
||||||
expect.objectContaining({
|
expect.objectContaining({data: {ids: [1, 2, 3]}}),
|
||||||
data: {ids: [1, 2, 3]},
|
|
||||||
}),
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ describe('navigateToIframeLink', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('unsafe links', () => {
|
test('unsafe links', () => {
|
||||||
|
const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||||
window.location.href = 'http://localhost:3000/';
|
window.location.href = 'http://localhost:3000/';
|
||||||
|
|
||||||
// eslint-disable-next-line no-script-url
|
// eslint-disable-next-line no-script-url
|
||||||
@@ -41,6 +42,7 @@ describe('navigateToIframeLink', () => {
|
|||||||
expect(openSpy).toHaveBeenCalledTimes(0);
|
expect(openSpy).toHaveBeenCalledTimes(0);
|
||||||
expect(assignSpy).toHaveBeenCalledTimes(0);
|
expect(assignSpy).toHaveBeenCalledTimes(0);
|
||||||
expect(window.location.href).toBe('http://localhost:3000/');
|
expect(window.location.href).toBe('http://localhost:3000/');
|
||||||
|
errorSpy.mockRestore();
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user