Skip to content

Commit 576c72c

Browse files
committed
Fixed tests
1 parent 7618afc commit 576c72c

File tree

4 files changed

+17
-33
lines changed

4 files changed

+17
-33
lines changed

__tests__/JobsList.test.js

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -118,28 +118,6 @@ describe('JobsList', () => {
118118
await fireEvent.click(clearFiltersBtn);
119119
}
120120

121-
it('refresh jobs', async () => {
122-
const jobUpdater = function () {
123-
return data.jobs.map((j) => (j.status === 'running' ? { ...j, status: 'done' } : j));
124-
};
125-
const result = render(JobsList, {
126-
props: { jobUpdater }
127-
});
128-
let table = result.getByRole('table');
129-
expect(table.querySelectorAll('tbody tr').length).eq(3);
130-
expect(table.querySelectorAll('tbody tr:nth-child(1) td')[0].textContent).eq('running');
131-
expect(table.querySelectorAll('tbody tr:nth-child(2) td')[0].textContent).eq('failed');
132-
expect(table.querySelectorAll('tbody tr:nth-child(3) td')[0].textContent).eq('done');
133-
134-
const refreshButton = result.getByRole('button', { name: 'Refresh' });
135-
await fireEvent.click(refreshButton);
136-
137-
table = result.getByRole('table');
138-
expect(table.querySelectorAll('tbody tr:nth-child(1) td')[0].textContent).eq('done');
139-
expect(table.querySelectorAll('tbody tr:nth-child(2) td')[0].textContent).eq('failed');
140-
expect(table.querySelectorAll('tbody tr:nth-child(3) td')[0].textContent).eq('done');
141-
});
142-
143121
it('cancel job', async () => {
144122
const nop = function () {};
145123
const result = render(JobsList, {
@@ -190,19 +168,19 @@ describe('JobsList', () => {
190168
});
191169
let table = result.getByRole('table');
192170
expect(table.querySelectorAll('tbody tr').length).eq(3);
193-
expect(table.querySelectorAll('tbody tr:nth-child(1) td')[0].textContent).eq('running');
194-
expect(table.querySelectorAll('tbody tr:nth-child(2) td')[0].textContent).eq('failed');
195-
expect(table.querySelectorAll('tbody tr:nth-child(3) td')[0].textContent).eq('done');
171+
expect(table.querySelectorAll('tbody tr:nth-child(1) td')[0].textContent).contain('running');
172+
expect(table.querySelectorAll('tbody tr:nth-child(2) td')[0].textContent).contain('failed');
173+
expect(table.querySelectorAll('tbody tr:nth-child(3) td')[0].textContent).contain('done');
196174

197175
vi.advanceTimersByTime(3500);
198176
vi.useRealTimers();
199177
// trigger table update
200178
await new Promise(setTimeout);
201179

202180
table = result.getByRole('table');
203-
expect(table.querySelectorAll('tbody tr:nth-child(1) td')[0].textContent).eq('done');
204-
expect(table.querySelectorAll('tbody tr:nth-child(2) td')[0].textContent).eq('failed');
205-
expect(table.querySelectorAll('tbody tr:nth-child(3) td')[0].textContent).eq('done');
181+
expect(table.querySelectorAll('tbody tr:nth-child(1) td')[0].textContent).contain('done');
182+
expect(table.querySelectorAll('tbody tr:nth-child(2) td')[0].textContent).contain('failed');
183+
expect(table.querySelectorAll('tbody tr:nth-child(3) td')[0].textContent).contain('done');
206184
} finally {
207185
vi.useRealTimers();
208186
}

__tests__/mock/jobs-list.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
export const data = {
2+
userInfo: {
3+
4+
},
25
projects: [
36
{
47
id: 1,
@@ -41,7 +44,8 @@ export const data = {
4144
workflow_dump: { id: 1, name: 'workflow 1' },
4245
input_dataset_dump: { id: 1, name: 'input1' },
4346
output_dataset_dump: { id: 2, name: 'output1' },
44-
status: 'done'
47+
status: 'done',
48+
user_email: '[email protected]'
4549
},
4650
{
4751
id: 2,
@@ -54,7 +58,8 @@ export const data = {
5458
workflow_dump: { id: 2, name: 'workflow 2' },
5559
input_dataset_dump: { id: 3, name: 'input2' },
5660
output_dataset_dump: { id: 4, name: 'output2' },
57-
status: 'failed'
61+
status: 'failed',
62+
user_email: '[email protected]'
5863
},
5964
{
6065
id: 3,
@@ -66,7 +71,8 @@ export const data = {
6671
input_dataset_dump: { id: 5, name: 'input3' },
6772
output_dataset_dump: { id: 6, name: 'output3' },
6873
end_timestamp: null,
69-
status: 'running'
74+
status: 'running',
75+
user_email: '[email protected]'
7076
}
7177
]
7278
};

tests/admin_jobs.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test('Execute a job and show it on the job tables', async ({ page }) => {
99

1010
await test.step('Open the admin area', async () => {
1111
await page.goto('/');
12-
await page.getByRole('link', { name: 'Administration' }).click();
12+
await page.getByRole('link', { name: 'Admin area' }).click();
1313
await page.waitForURL('/admin');
1414
});
1515

tests/users_crud.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { expect, test } from './base_test.js';
33
test('Create, update and delete a user', async ({ page }) => {
44
await test.step('Open the admin area', async () => {
55
await page.goto('/');
6-
await page.getByRole('link', { name: 'Administration' }).click();
6+
await page.getByRole('link', { name: 'Admin area' }).click();
77
await page.waitForURL('/admin');
88
});
99

0 commit comments

Comments
 (0)