mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-29 15:13:53 +03:00
d9252f53a3
In the combination of events where the user is viewing an action that is completed (and therefore no interval-based loading of logs is occurring), and `loadJob` is called while `loadJob` is already running (commonly from expanding two log sections back-to-back), the second request for loading would be discarded and never occur. To fix this, the invocation of `loadJob` keeps track of the log cursors it is attempting to load, and an aborted invocation stores its attempted load. If `loadJob` succeeds in loading and finds that an attempt was aborted while it was busy, it will reload the data. Steps to reproduce: - Open an Action UI that is already "Done". - Click on two steps in rapid succession to expand their logs. - (Race condition) As long as the second click is registered while the first log chunk is being loaded, its data won't load. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... (**not applicable**) - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [x] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6122 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
217 lines
6.5 KiB
JavaScript
217 lines
6.5 KiB
JavaScript
import {mount, flushPromises} from '@vue/test-utils';
|
|
import RepoActionView from './RepoActionView.vue';
|
|
|
|
test('processes ##[group] and ##[endgroup]', async () => {
|
|
Object.defineProperty(document.documentElement, 'lang', {value: 'en'});
|
|
vi.spyOn(global, 'fetch').mockImplementation((url, opts) => {
|
|
const artifacts_value = {
|
|
artifacts: [],
|
|
};
|
|
const stepsLog_value = [
|
|
{
|
|
step: 0,
|
|
cursor: 0,
|
|
lines: [
|
|
{index: 1, message: '##[group]Test group', timestamp: 0},
|
|
{index: 2, message: 'A test line', timestamp: 0},
|
|
{index: 3, message: '##[endgroup]', timestamp: 0},
|
|
{index: 4, message: 'A line outside the group', timestamp: 0},
|
|
],
|
|
},
|
|
];
|
|
const jobs_value = {
|
|
state: {
|
|
run: {
|
|
status: 'success',
|
|
commit: {
|
|
pusher: {},
|
|
},
|
|
},
|
|
currentJob: {
|
|
steps: [
|
|
{
|
|
summary: 'Test Job',
|
|
duration: '1s',
|
|
status: 'success',
|
|
},
|
|
],
|
|
},
|
|
},
|
|
logs: {
|
|
stepsLog: opts.body?.includes('"cursor":null') ? stepsLog_value : [],
|
|
},
|
|
};
|
|
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: vi.fn().mockResolvedValue(
|
|
url.endsWith('/artifacts') ? artifacts_value : jobs_value,
|
|
),
|
|
});
|
|
});
|
|
|
|
const wrapper = mount(RepoActionView, {
|
|
props: {
|
|
jobIndex: '1',
|
|
locale: {
|
|
approve: '',
|
|
cancel: '',
|
|
rerun: '',
|
|
artifactsTitle: '',
|
|
areYouSure: '',
|
|
confirmDeleteArtifact: '',
|
|
rerun_all: '',
|
|
showTimeStamps: '',
|
|
showLogSeconds: '',
|
|
showFullScreen: '',
|
|
downloadLogs: '',
|
|
status: {
|
|
unknown: '',
|
|
waiting: '',
|
|
running: '',
|
|
success: '',
|
|
failure: '',
|
|
cancelled: '',
|
|
skipped: '',
|
|
blocked: '',
|
|
},
|
|
},
|
|
},
|
|
});
|
|
await flushPromises();
|
|
await wrapper.get('.job-step-summary').trigger('click');
|
|
await flushPromises();
|
|
|
|
// Test if header was loaded correctly
|
|
expect(wrapper.get('.step-summary-msg').text()).toEqual('Test Job');
|
|
|
|
// Check if 3 lines where rendered
|
|
expect(wrapper.findAll('.job-log-line').length).toEqual(3);
|
|
|
|
// Check if line 1 contains the group header
|
|
expect(wrapper.get('.job-log-line:nth-of-type(1) > details.log-msg').text()).toEqual('Test group');
|
|
|
|
// Check if right after the header line exists a log list
|
|
expect(wrapper.find('.job-log-line:nth-of-type(1) + .job-log-list.hidden').exists()).toBe(true);
|
|
|
|
// Check if inside the loglist exist exactly one log line
|
|
expect(wrapper.findAll('.job-log-list > .job-log-line').length).toEqual(1);
|
|
|
|
// Check if inside the loglist is an logline with our second logline
|
|
expect(wrapper.get('.job-log-list > .job-log-line > .log-msg').text()).toEqual('A test line');
|
|
|
|
// Check if after the log list exists another log line
|
|
expect(wrapper.get('.job-log-list + .job-log-line > .log-msg').text()).toEqual('A line outside the group');
|
|
});
|
|
|
|
test('load multiple steps on a finished action', async () => {
|
|
Object.defineProperty(document.documentElement, 'lang', {value: 'en'});
|
|
vi.spyOn(global, 'fetch').mockImplementation((url, opts) => {
|
|
if (url.endsWith('/artifacts')) {
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: vi.fn().mockResolvedValue(
|
|
{
|
|
artifacts: [],
|
|
},
|
|
),
|
|
});
|
|
}
|
|
|
|
const postBody = JSON.parse(opts.body);
|
|
const stepsLog_value = [];
|
|
for (const cursor of postBody.logCursors) {
|
|
if (cursor.expanded) {
|
|
stepsLog_value.push(
|
|
{
|
|
step: cursor.step,
|
|
cursor: 0,
|
|
lines: [
|
|
{index: 1, message: `Step #${cursor.step + 1} Log #1`, timestamp: 0},
|
|
{index: 1, message: `Step #${cursor.step + 1} Log #2`, timestamp: 0},
|
|
{index: 1, message: `Step #${cursor.step + 1} Log #3`, timestamp: 0},
|
|
],
|
|
},
|
|
);
|
|
}
|
|
}
|
|
const jobs_value = {
|
|
state: {
|
|
run: {
|
|
status: 'success',
|
|
commit: {
|
|
pusher: {},
|
|
},
|
|
},
|
|
currentJob: {
|
|
steps: [
|
|
{
|
|
summary: 'Test Step #1',
|
|
duration: '1s',
|
|
status: 'success',
|
|
},
|
|
{
|
|
summary: 'Test Step #2',
|
|
duration: '1s',
|
|
status: 'success',
|
|
},
|
|
],
|
|
},
|
|
},
|
|
logs: {
|
|
stepsLog: opts.body?.includes('"cursor":null') ? stepsLog_value : [],
|
|
},
|
|
};
|
|
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: vi.fn().mockResolvedValue(
|
|
jobs_value,
|
|
),
|
|
});
|
|
});
|
|
|
|
const wrapper = mount(RepoActionView, {
|
|
props: {
|
|
actionsURL: 'https://example.com/example-org/example-repo/actions',
|
|
runIndex: '1',
|
|
jobIndex: '2',
|
|
locale: {
|
|
approve: '',
|
|
cancel: '',
|
|
rerun: '',
|
|
artifactsTitle: '',
|
|
areYouSure: '',
|
|
confirmDeleteArtifact: '',
|
|
rerun_all: '',
|
|
showTimeStamps: '',
|
|
showLogSeconds: '',
|
|
showFullScreen: '',
|
|
downloadLogs: '',
|
|
status: {
|
|
unknown: '',
|
|
waiting: '',
|
|
running: '',
|
|
success: '',
|
|
failure: '',
|
|
cancelled: '',
|
|
skipped: '',
|
|
blocked: '',
|
|
},
|
|
},
|
|
},
|
|
});
|
|
await flushPromises();
|
|
// Click on both steps to start their log loading in fast succession...
|
|
await wrapper.get('.job-step-section:nth-of-type(1) .job-step-summary').trigger('click');
|
|
await wrapper.get('.job-step-section:nth-of-type(2) .job-step-summary').trigger('click');
|
|
await flushPromises();
|
|
|
|
// Verify both step's logs were loaded
|
|
expect(wrapper.get('.job-step-section:nth-of-type(1) .job-log-line:nth-of-type(1) .log-msg').text()).toEqual('Step #1 Log #1');
|
|
expect(wrapper.get('.job-step-section:nth-of-type(1) .job-log-line:nth-of-type(2) .log-msg').text()).toEqual('Step #1 Log #2');
|
|
expect(wrapper.get('.job-step-section:nth-of-type(1) .job-log-line:nth-of-type(3) .log-msg').text()).toEqual('Step #1 Log #3');
|
|
expect(wrapper.get('.job-step-section:nth-of-type(2) .job-log-line:nth-of-type(1) .log-msg').text()).toEqual('Step #2 Log #1');
|
|
expect(wrapper.get('.job-step-section:nth-of-type(2) .job-log-line:nth-of-type(2) .log-msg').text()).toEqual('Step #2 Log #2');
|
|
expect(wrapper.get('.job-step-section:nth-of-type(2) .job-log-line:nth-of-type(3) .log-msg').text()).toEqual('Step #2 Log #3');
|
|
});
|