Fixed some issues with tests

zonia3000 · zonia3000 · commit 06b24d2f3c21 · 2024-05-13T12:06:50.000+02:00
diff --git a/src/routes/v2/admin/tasks/+page.svelte b/src/routes/v2/admin/tasks/+page.svelte
@@ -287,7 +287,7 @@
 				<col width="90" />
 				<col width="80" />
 				<col width="120" />
-				<col width="120" />
+				<col width="150" />
 				<col width="100" />
 			</colgroup>
 			<thead>
diff --git a/src/routes/v2/projects/[projectId]/datasets/[datasetId]/+page.svelte b/src/routes/v2/projects/[projectId]/datasets/[datasetId]/+page.svelte
@@ -215,25 +215,31 @@
 
 	async function applySearchFields() {
 		searching = true;
+		await searchImages();
 		resetBtnActive =
 			Object.values(attributeFilters).filter((a) => a !== null).length > 0 ||
 			Object.values(typeFilters).filter((t) => t !== null).length > 0;
-		await searchImages();
 		searching = false;
 	}
 
 	async function resetSearchFields() {
+		resetBtnActive = false;
 		resetting = true;
+		for (const selector of Object.values(attributesSelectors)) {
+			selector.setSelected('');
+		}
 		attributeFilters = getAttributeFilterBaseValues(imagePage);
 		typeFilters = getTypeFilterBaseValues(imagePage);
-		resetBtnActive = false;
 		await tick();
 		await searchImages();
 		resetting = false;
 	}
 
 	async function reload() {
 		reloading = true;
+		attributeFilters = getAttributeFilterBaseValues(imagePage);
+		typeFilters = getTypeFilterBaseValues(imagePage);
+		await tick();
 		await searchImages();
 		reloading = false;
 	}
@@ -484,23 +490,23 @@
 							<button
 								class="btn"
 								on:click={applySearchFields}
-								disabled={searching || !applyBtnActive}
+								disabled={searching || resetting || !applyBtnActive}
 								class:btn-primary={applyBtnActive}
 								class:btn-secondary={!applyBtnActive}
 							>
-								{#if searching && applyBtnActive}
+								{#if searching}
 									<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true" />
 								{/if}
 								Apply
 							</button>
 							<button
 								class="btn"
 								on:click={resetSearchFields}
-								disabled={resetting || !resetBtnActive}
+								disabled={resetting || searching || !resetBtnActive}
 								class:btn-warning={resetBtnActive}
 								class:btn-secondary={!resetBtnActive}
 							>
-								{#if resetting && resetBtnActive}
+								{#if resetting}
 									<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true" />
 								{/if}
 								Reset
@@ -565,7 +571,7 @@
 						value={false}
 						bind:group={useDatasetFilters}
 						on:change={reload}
-						disabled={reloading}
+						disabled={reloading || searching || resetting}
 					/>
 					<label class="btn btn-white btn-outline-primary" for="all-images">All images</label>
 					<input
@@ -577,7 +583,7 @@
 						value={true}
 						bind:group={useDatasetFilters}
 						on:change={reload}
-						disabled={reloading}
+						disabled={reloading || searching || resetting}
 					/>
 					<label class="btn btn-white btn-outline-primary" for="dataset-filters">
 						Dataset filters
diff --git a/src/routes/v2/projects/[projectId]/workflows/[workflowId]/+page.svelte b/src/routes/v2/projects/[projectId]/workflows/[workflowId]/+page.svelte
@@ -562,7 +562,7 @@
 		await tick();
 		saveSelectedDataset(workflow, selectedDatasetId);
 		await inputFiltersTab?.init();
-		loadJobsStatus();
+		await loadJobsStatus();
 	}
 
 	async function loadJobsStatus() {
diff --git a/tests/utils.js b/tests/utils.js
@@ -22,6 +22,7 @@ export async function waitPageLoading(page) {
  */
 export async function waitModalClosed(page) {
 	await page.waitForFunction(() => document.querySelector('.modal.show') === null);
+	await expect(page.locator('.modal.show')).toHaveCount(0);
 }
 
 /**
@@ -73,4 +74,5 @@ export async function selectSlimSelect(page, selector, optionValue) {
 	}
 	expect(selectedItem).not.toBeNull();
 	await /** @type {import('@playwright/test').Locator} */ (selectedItem).click();
+	await expect(selector).toHaveText(optionValue);
 }
diff --git a/tests/v2/images.spec.js b/tests/v2/images.spec.js
@@ -100,8 +100,9 @@ test('Dataset images [v2]', async ({ page, project }) => {
 	});
 
 	await test.step('Enable dataset filters', async () => {
-		expect(await page.getByRole('row').count()).toEqual(7);
+		await expect(page.getByRole('row')).toHaveCount(7);
 		const datasetFiltersBtn = page.getByText('Dataset filters').first();
+		await expect(datasetFiltersBtn).toBeEnabled();
 		await datasetFiltersBtn.click();
 		await expect(datasetFiltersBtn).toBeEnabled();
 		await expect(page.getByRole('row')).toHaveCount(3);
@@ -162,16 +163,18 @@ async function createImage(page, zarr_url, filtersFunction) {
  * @param {number} expectedCount
  */
 async function searchImages(page, expectedCount) {
-	const initialCount = await page.getByRole('row').count();
+	await expect(page.getByRole('row')).toHaveCount(7);
 	const applyBtn = page.getByRole('button', { name: 'Apply' });
 	await applyBtn.click();
 	await expect(applyBtn).not.toBeEnabled();
+	// wait spinner disappearing
+	await expect(applyBtn.getByRole('status')).toHaveCount(0);
 	await expect(page.getByRole('row')).toHaveCount(expectedCount + 2);
-	const resetBtn = page.getByRole('button', { name: 'Reset' });
+	const resetBtn = page.getByRole('button', { name: 'Reset', exact: true });
 	await resetBtn.click();
-	await expect(applyBtn).not.toBeEnabled();
 	await expect(resetBtn).not.toBeEnabled();
+	await expect(applyBtn).not.toBeEnabled();
 	// wait spinner disappearing
 	await expect(resetBtn.getByRole('status')).toHaveCount(0);
-	await expect(page.getByRole('row')).toHaveCount(initialCount);
+	await expect(page.getByRole('row')).toHaveCount(7);
 }
diff --git a/tests/v2/run_mock_tasks.spec.js b/tests/v2/run_mock_tasks.spec.js
@@ -204,10 +204,11 @@ test('Collect and run mock tasks [v2]', async ({ page, workflow, request }) => {
 	});
 
 	await test.step('Select the second dataset', async () => {
-		await page
-			.getByRole('combobox', { name: 'Dataset', exact: true })
-			.first()
-			.selectOption(datasetName2);
+		const datasetDropdown = page.getByRole('combobox', { name: 'Dataset', exact: true }).first();
+		await expect(
+			datasetDropdown.getByRole('option', { name: datasetName2, includeHidden: true })
+		).toBeHidden();
+		await datasetDropdown.selectOption(datasetName2);
 	});
 
 	await test.step('Add and select generic_task', async () => {
@@ -303,6 +304,12 @@ test('Collect and run mock tasks [v2]', async ({ page, workflow, request }) => {
 	});
 
 	await test.step('Cleanup zarr_dir', async () => {
+		await expect
+			.poll(() => fs.existsSync(`/tmp/playwright/datasets/${datasetName2}`), {
+				timeout: 5000,
+				message: `File /tmp/playwright/datasets/${datasetName2} doesn't exist`
+			})
+			.toBeTruthy();
 		fs.rmSync(`/tmp/playwright/datasets/${datasetName2}`, { recursive: true });
 	});
 

Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@`
`562`	`562`	`await tick();`
`563`	`563`	`saveSelectedDataset(workflow, selectedDatasetId);`
`564`	`564`	`await inputFiltersTab?.init();`
`565`		`- loadJobsStatus();`
	`565`	`+ await loadJobsStatus();`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`async function loadJobsStatus() {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ export async function waitPageLoading(page) {`
`22`	`22`	`*/`
`23`	`23`	`export async function waitModalClosed(page) {`
`24`	`24`	`await page.waitForFunction(() => document.querySelector('.modal.show') === null);`
	`25`	`+ await expect(page.locator('.modal.show')).toHaveCount(0);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`/**`
`@@ -73,4 +74,5 @@ export async function selectSlimSelect(page, selector, optionValue) {`
`73`	`74`	`}`
`74`	`75`	`expect(selectedItem).not.toBeNull();`
`75`	`76`	`await /** @type {import('@playwright/test').Locator} */ (selectedItem).click();`
	`77`	`+ await expect(selector).toHaveText(optionValue);`
`76`	`78`	`}`