Skip to content

Commit e27b700

Browse files
zonia3000zonia3000
committed
Fixed tests
1 parent 3e63cb1 commit e27b700

File tree

3 files changed

+33
-26
lines changed

3 files changed

+33
-26
lines changed

‎__tests__/job_utilities.test.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ it('generates new unique dataset name', () => {
239239
});
240240

241241
it('get first task index for continuing workflow', () => {
242-
const doneImages = createImageStatus(0, 2, 0);
243-
const failedImages = createImageStatus(0, 0, 3);
244-
const submittedImages = createImageStatus(5, 0, 0);
242+
const doneImages = createImageStatus('done', 0, 2, 0);
243+
const failedImages = createImageStatus('failed', 0, 0, 3);
244+
const submittedImages = createImageStatus('submitted', 5, 0, 0);
245245
expect(testGetFirstTaskIndexForContinuingWorkflow([null, null, null, null])).toEqual(0);
246246
expect(testGetFirstTaskIndexForContinuingWorkflow([doneImages, doneImages, null, null])).toEqual(
247247
2
@@ -278,8 +278,9 @@ function getMockedDatasets(names) {
278278
* @param {number} failed
279279
* @returns {import('fractal-components/types/api').ImagesStatus}
280280
*/
281-
function createImageStatus(submitted, done, failed) {
281+
function createImageStatus(status, submitted, done, failed) {
282282
return {
283+
status,
283284
num_submitted_images: submitted,
284285
num_done_images: done,
285286
num_failed_images: failed,

‎__tests__/v2/RunWorkflowModal.test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ describe('RunWorkflowModal', () => {
6161
onDatasetsUpdated: vi.fn(),
6262
statuses: {
6363
1: {
64+
status: 'partial',
6465
num_submitted_images: 0,
6566
num_done_images: 0,
6667
num_failed_images: 5,

‎tests/v2/workflow_subsets.spec.js‎ renamed to ‎tests/v2/workflow_task_runs.spec.js‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { selectSlimSelect, waitModalClosed, waitPageLoading } from '../utils.js'
33
import { createDataset } from './dataset_utils.js';
44
import { waitTaskFailure, waitTasksSuccess } from './workflow_task_utils.js';
55

6-
test('Workflow subsets', async ({ page, workflow }) => {
6+
test('Workflow task runs', async ({ page, workflow }) => {
77
await page.waitForURL(workflow.url);
88
await waitPageLoading(page);
99

@@ -52,14 +52,14 @@ test('Workflow subsets', async ({ page, workflow }) => {
5252
await test.step('Open logs modal', async () => {
5353
await page.locator('[aria-label="Done images"]').last().click();
5454
await modal.waitFor();
55-
await expect(modal.getByText("Images with status='done'")).toBeVisible();
56-
await expect(modal.getByText('Total results: 15')).toBeVisible();
55+
await expect(modal.getByText('Images')).toBeVisible();
56+
await expect(modal.getByText('Total results: 30')).toBeVisible();
5757
await modal.getByRole('button', { name: '2' }).click();
58-
await expect(modal.getByRole('row')).toHaveCount(5);
58+
await expect(modal.getByRole('row')).toHaveCount(11);
5959
await modal.getByRole('button', { name: 'Logs' }).last().click();
60-
await expect(modal.getByText('START cellpose_segmentation task')).toBeVisible();
60+
await expect(modal.getByText("Logs for task 'cellpose_segmentation'")).toBeVisible();
6161
await modal.getByRole('button', { name: 'Back' }).click();
62-
await expect(modal.getByRole('row')).toHaveCount(5);
62+
await expect(modal.getByRole('row')).toHaveCount(11);
6363
await modal.getByRole('button', { name: 'Close' }).click();
6464
await waitModalClosed(page);
6565
});
@@ -87,42 +87,43 @@ test('Workflow subsets', async ({ page, workflow }) => {
8787
await waitTasksSuccess(page);
8888
});
8989

90-
await test.step('Open subsets of last task and check meta', async () => {
90+
await test.step('Open runs of last task and check meta', async () => {
9191
await page.getByRole('button', { name: 'Meta', exact: true }).click();
9292
await expect(page.getByPlaceholder('Argument name')).toHaveValue('k2');
9393
await expect(page.getByPlaceholder('Argument value')).toHaveValue('v2');
9494
await expect(page.getByRole('button', { name: 'Add property' })).toBeEnabled();
95-
await page.locator('[aria-label="Show subsets"]').last().click();
96-
await page.getByRole('button', { name: 'Subset 1' }).click();
95+
await page.locator('[aria-label="Show runs"]').last().click();
96+
await page.getByRole('button', { name: 'Run 1' }).click();
9797
await expect(page.getByPlaceholder('Argument name')).toHaveValue('k1');
9898
await expect(page.getByPlaceholder('Argument value')).toHaveValue('v1');
9999
await expect(page.getByRole('button', { name: 'Add property' })).not.toBeEnabled();
100-
await page.getByRole('button', { name: 'Subset 2' }).click();
100+
await page.getByRole('button', { name: 'Run 2' }).click();
101101
await expect(page.getByPlaceholder('Argument name')).toHaveValue('k2');
102102
await expect(page.getByPlaceholder('Argument value')).toHaveValue('v2');
103103
await expect(page.getByRole('button', { name: 'Add property' })).not.toBeEnabled();
104104
});
105105

106-
await test.step('Open subset logs modal', async () => {
106+
await test.step('Open run logs modal', async () => {
107107
await page.locator('[aria-label="Done images"]').last().click();
108108
await modal.waitFor();
109+
await expect(modal.getByText('Run 2')).toBeVisible();
109110
await expect(modal.getByText('Total results: 1')).toBeVisible();
110-
await expect(modal.getByRole('row')).toHaveCount(1);
111+
await expect(modal.getByRole('row')).toHaveCount(2);
111112
await modal.getByRole('button', { name: 'Close' }).click();
112113
await waitModalClosed(page);
113114
});
114115

115-
await test.step('Open subsets of second task and check arguments', async () => {
116+
await test.step('Open runs of second task and check arguments', async () => {
116117
await workflow.selectTask('illumination_correction');
117-
await expect(page.getByRole('button', { name: 'Subset 1' })).not.toBeVisible();
118+
await expect(page.getByRole('button', { name: 'Run 1' })).not.toBeVisible();
118119
await page.getByRole('button', { name: 'Arguments', exact: true }).click();
119120
await page.getByRole('switch').check();
120121
await page.getByRole('button', { name: 'Save changes' }).click();
121122
await expect(page.getByRole('button', { name: 'Save changes' })).toBeDisabled();
122123
await expect(page.getByRole('switch')).toBeChecked();
123-
await page.locator('[aria-label="Show subsets"]').nth(1).click();
124-
await page.getByRole('button', { name: 'Subset 1' }).click();
125-
await expect(page.getByRole('button', { name: 'Subset 2' })).not.toBeVisible();
124+
await page.locator('[aria-label="Show runs"]').nth(1).click();
125+
await page.getByRole('button', { name: 'Run 1' }).click();
126+
await expect(page.getByRole('button', { name: 'Run 2' })).not.toBeVisible();
126127
await expect(page.getByRole('switch')).not.toBeChecked();
127128
await expect(page.getByRole('switch')).not.toBeEditable();
128129
});
@@ -142,11 +143,15 @@ test('Workflow subsets', async ({ page, workflow }) => {
142143
await test.step('Open failed logs modal', async () => {
143144
await page.locator('[aria-label="Failed images"]').first().click();
144145
await modal.waitFor();
145-
await expect(modal.getByText("Images with status='failed'")).toBeVisible();
146-
await expect(modal.getByText('Total results: 15')).toBeVisible();
147-
await modal.getByRole('button', { name: 'Logs' }).first().click();
148-
await modal.getByRole('button', { name: 'click here to expand' }).click();
149-
await expect(page.getByText('Traceback')).toBeVisible();
146+
await expect(modal.getByText('Images')).toBeVisible();
147+
await expect(modal.getByText('Total results: 30')).toBeVisible();
148+
await modal
149+
.getByRole('row', { name: 'failed' })
150+
.first()
151+
.getByRole('button', { name: 'Logs' })
152+
.click();
153+
await expect(modal.locator('.expandable-log')).toBeVisible();
154+
await expect(page.getByText("Logs for task 'create_ome_zarr_compound'")).toBeVisible();
150155
await modal.getByRole('button', { name: 'Close' }).click();
151156
await waitModalClosed(page);
152157
});

0 commit comments

Comments
 (0)