Test fixes

Author: zonia3000

__tests__/Paginator.test.js

@@ -87,16 +87,16 @@ describe('Paginator', () => {
 	});
 	it('previous is disabled on first page', async () => {
 		const result = render(Paginator, {
-			props: { pageSize: 10, totalCount: 3, currentPage: 1, onPageChange: () => {} }
+			props: { pageSize: 10, totalCount: 13, currentPage: 1, onPageChange: () => {} }
 		});
-		expect(getPageItems(result)).toEqual(['«', '1', '»']);
+		expect(getPageItems(result)).toEqual(['«', '1', '2', '»']);
 		expect(result.queryByLabelText('Previous').disabled).true;
 	});
 	it('next is disabled on last page', async () => {
 		const result = render(Paginator, {
-			props: { pageSize: 10, totalCount: 3, currentPage: 1, onPageChange: () => {} }
+			props: { pageSize: 10, totalCount: 13, currentPage: 2, onPageChange: () => {} }
 		});
-		expect(getPageItems(result)).toEqual(['«', '1', '»']);
+		expect(getPageItems(result)).toEqual(['«', '1', '2', '»']);
 		expect(result.queryByLabelText('Next').disabled).true;
 	});
 });

__tests__/v2/CreateDatasetModal.test.js

@@ -30,7 +30,7 @@ global.window.bootstrap = {
 import CreateDatasetModal from '../../src/lib/components/v2/projects/datasets/CreateDatasetModal.svelte';
 
 const defaultProps = {
-	props: { createDatasetCallback: vi.fn(), updateDatasetCallback: vi.fn() }
+	props: { createDatasetCallback: vi.fn() }
 };
 
 describe('CreateDatasetModal', () => {
@@ -56,7 +56,7 @@ describe('CreateDatasetModal', () => {
 	it('create dataset with string filter', async () => {
 		const createDatasetCallback = vi.fn();
 		const result = render(CreateDatasetModal, {
-			props: { createDatasetCallback, updateDatasetCallback: vi.fn() }
+			props: { createDatasetCallback }
 		});
 		await fireEvent.input(result.getByRole('textbox', { name: 'Dataset Name' }), {
 			target: { value: 'my dataset' }
@@ -86,7 +86,7 @@ describe('CreateDatasetModal', () => {
 	it('create dataset with number filter', async () => {
 		const createDatasetCallback = vi.fn();
 		const result = render(CreateDatasetModal, {
-			props: { createDatasetCallback, updateDatasetCallback: vi.fn() }
+			props: { createDatasetCallback }
 		});
 		await fireEvent.input(result.getByRole('textbox', { name: 'Dataset Name' }), {
 			target: { value: 'my dataset' }
@@ -117,7 +117,7 @@ describe('CreateDatasetModal', () => {
 	it('create dataset with type filter set to false', async () => {
 		const createDatasetCallback = vi.fn();
 		const result = render(CreateDatasetModal, {
-			props: { createDatasetCallback, updateDatasetCallback: vi.fn() }
+			props: { createDatasetCallback }
 		});
 		await fireEvent.input(result.getByRole('textbox', { name: 'Dataset Name' }), {
 			target: { value: 'my dataset' }
@@ -146,7 +146,7 @@ describe('CreateDatasetModal', () => {
 	it('create dataset with type filter set to true', async () => {
 		const createDatasetCallback = vi.fn();
 		const result = render(CreateDatasetModal, {
-			props: { createDatasetCallback, updateDatasetCallback: vi.fn() }
+			props: { createDatasetCallback }
 		});
 		await fireEvent.input(result.getByRole('textbox', { name: 'Dataset Name' }), {
 			target: { value: 'my dataset' }

playwright.config.js

@@ -47,7 +47,7 @@ export default defineConfig({
 
 	webServer: [
 		{
-			command: './tests/start-test-server.sh 2.0.0a6',
+			command: './tests/start-test-server.sh 2.0.0a8',
 			port: 8000,
 			waitForPort: true,
 			stdout: 'pipe',

src/lib/components/v2/projects/datasets/FiltersCreationForm.svelte

@@ -117,7 +117,7 @@
 	function fieldTypeChanged(field) {
 		if (field.type === 'boolean') {
 			field.value = 'true';
-		} else {
+		} else if (field.type !== 'number' || !field.value.match(/^\d+\.*\d*$/)) {
 			field.value = '';
 		}
 	}

src/lib/components/v2/workflow/InputFiltersTab.svelte

@@ -1,5 +1,5 @@
 <script>
-	import { onMount, tick } from 'svelte';
+	import { onMount } from 'svelte';
 	import FiltersCreationForm from '../projects/datasets/FiltersCreationForm.svelte';
 	import { displayStandardErrorAlert } from '$lib/common/errors';
 	import Modal from '$lib/components/common/Modal.svelte';

tests/v2/images.spec.js

@@ -141,13 +141,13 @@ async function createImage(page, zarr_url, filtersFunction) {
  */
 async function searchImages(page, expectedCount) {
 	const initialCount = await page.getByRole('row').count();
-	const searchImagesBtn = page.getByRole('button', { name: 'Apply' });
-	await searchImagesBtn.click();
-	await expect(searchImagesBtn).toBeEnabled();
+	const applyBtn = page.getByRole('button', { name: 'Apply' });
+	await applyBtn.click();
+	await expect(applyBtn).not.toBeEnabled();
 	await expect(page.getByRole('row')).toHaveCount(expectedCount + 2);
 	const resetBtn = page.getByRole('button', { name: 'Reset' });
 	await resetBtn.click();
-	await expect(searchImagesBtn).not.toBeEnabled();
+	await expect(applyBtn).not.toBeEnabled();
 	await expect(resetBtn).not.toBeEnabled();
 	// wait spinner disappearing
 	await expect(resetBtn.getByRole('status')).toHaveCount(0);