Skip to content

Commit 2aa5c87

Browse files
committed
Minor fixes
1 parent e268d7e commit 2aa5c87

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

__tests__/v2/VersionUpdate.test.js

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,9 @@ function getMockedWorkflowTask() {
263263

264264
describe('VersionUpdate', () => {
265265
beforeEach(() => {
266-
fetch.mockClear();
266+
/** @type {import('vitest').Mock} */ (fetch).mockClear();
267267
});
268-
268+
269269
it('update task without changing the arguments', async () => {
270270
const task = getTask('My Task', '1.2.3');
271271
const versions = /** @type {string[]} */ (
@@ -407,13 +407,15 @@ describe('VersionUpdate', () => {
407407

408408
it('update task with default parameters and no previous values', async () => {
409409
const task = getTask('task_default_values', '0.0.1');
410-
const versions = await checkVersions(task, 1);
410+
const versions = /** @type {string[]} */ (
411+
await checkVersions(task, 1, getMockedWorkflowTask())
412+
);
411413
expect(versions[0]).toBe('0.0.2');
412414

413415
await fireEvent.change(screen.getByRole('combobox'), { target: { value: '0.0.2' } });
414416

415417
const btn = screen.getByRole('button', { name: 'Update' });
416-
expect(btn.disabled).eq(false);
418+
expect(btn).toBeEnabled();
417419
await fireEvent.click(btn);
418420

419421
expect(fetch).toHaveBeenNthCalledWith(
@@ -424,7 +426,7 @@ describe('VersionUpdate', () => {
424426
args_non_parallel: {
425427
default_boolean1: false,
426428
default_boolean2: true,
427-
default_string: 'foo',
429+
default_string: 'foo'
428430
},
429431
args_parallel: null
430432
})
@@ -434,17 +436,22 @@ describe('VersionUpdate', () => {
434436

435437
it('update task with default parameters and previous values', async () => {
436438
const task = getTask('task_default_values', '0.0.1');
437-
const versions = await checkVersions(task, 1, {
438-
args_non_parallel: {
439-
default_boolean1: true,
440-
}, args_parallel: null
441-
});
439+
const versions = /** @type {string[]} */ (
440+
await checkVersions(task, 1, {
441+
...getMockedWorkflowTask(),
442+
...{
443+
args_non_parallel: {
444+
default_boolean1: true
445+
}
446+
}
447+
})
448+
);
442449
expect(versions[0]).toBe('0.0.2');
443450

444451
await fireEvent.change(screen.getByRole('combobox'), { target: { value: '0.0.2' } });
445452

446453
const btn = screen.getByRole('button', { name: 'Update' });
447-
expect(btn.disabled).eq(false);
454+
expect(btn).toBeEnabled();
448455
await fireEvent.click(btn);
449456

450457
expect(fetch).toHaveBeenNthCalledWith(
@@ -455,7 +462,7 @@ describe('VersionUpdate', () => {
455462
args_non_parallel: {
456463
default_boolean1: true,
457464
default_boolean2: true,
458-
default_string: 'foo',
465+
default_string: 'foo'
459466
},
460467
args_parallel: null
461468
})

src/routes/v2/admin/settings/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<table class="table table-striped">
2727
<tbody>
2828
{#each Object.entries(settings) as [key, value]}
29-
{#if showObfuscated || value !== '***'}
29+
{#if showObfuscated || value !== '**********'}
3030
<tr>
3131
<th>{key}</th>
3232
<td>{value}</td>

tests/v2/admin_settings.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ test('Show the admin settings page', async ({ page }) => {
66
await page.goto('/v2/admin/settings');
77
await waitPageLoading(page);
88
await expect(page.getByRole('cell', { name: 'FRACTAL_TASKS_DIR', exact: true })).toBeVisible();
9-
await expect(page.getByText('***')).not.toBeVisible();
9+
await expect(page.getByText('**********')).not.toBeVisible();
1010
});
1111

1212
await test.step('Display obfuscated settings', async () => {
1313
await page.getByRole('switch').check();
14-
await expect(page.getByText('***').first()).toBeVisible();
14+
await expect(page.getByText('**********').first()).toBeVisible();
1515
});
1616
});

0 commit comments

Comments
 (0)