From 21c07de4071c27a665658da48802b031acba59c7 Mon Sep 17 00:00:00 2001 From: baseballyama Date: Thu, 30 Dec 2021 17:41:43 +0900 Subject: [PATCH] add done() call --- test/runtime/index.ts | 23 ++++++++++++----------- test/server-side-rendering/index.ts | 3 ++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/test/runtime/index.ts b/test/runtime/index.ts index e777196ae2..1f92b18242 100644 --- a/test/runtime/index.ts +++ b/test/runtime/index.ts @@ -35,7 +35,7 @@ describe('runtime', () => { svelte = loadSvelte(false); svelte$ = loadSvelte(true); - require.extensions['.svelte'] = function(module, filename) { + require.extensions['.svelte'] = function (module, filename) { const options = Object.assign({ filename }, compileOptions); @@ -65,7 +65,7 @@ describe('runtime', () => { } const testName = `${dir} ${hydrate ? `(with hydration${from_ssr_html ? ' from ssr rendered html' : ''})` : ''}`; - (config.skip ? it.skip : solo ? it.only : it)(testName, () => { + (config.skip ? it.skip : solo ? it.only : it)(testName, (done) => { if (failed.has(dir)) { // this makes debugging easier, by only printing compiled output once throw new Error('skipping test, already failed'); @@ -96,7 +96,7 @@ describe('runtime', () => { glob('**/*.svelte', { cwd }).forEach(file => { if (file[0] === '_') return; - const dir = `${cwd}/_output/${hydrate ? 'hydratable' : 'normal'}`; + const dir = `${cwd}/_output/${hydrate ? 'hydratable' : 'normal'}`; const out = `${dir}/${file.replace(/\.svelte$/, '.js')}`; if (fs.existsSync(out)) { @@ -120,7 +120,7 @@ describe('runtime', () => { } }); - return Promise.resolve() + Promise.resolve() .then(() => { // hack to support transition tests clear_loops(); @@ -203,7 +203,7 @@ describe('runtime', () => { } if (config.test) { - return Promise.resolve(config.test({ + config.test({ assert, component, mod, @@ -211,13 +211,12 @@ describe('runtime', () => { window, raf, compileOptions - })).then(() => { - component.$destroy(); - - if (unhandled_rejection) { - throw unhandled_rejection; - } }); + component.$destroy(); + + if (unhandled_rejection) { + throw unhandled_rejection; + } } else { component.$destroy(); assert.htmlEqual(target.innerHTML, ''); @@ -245,6 +244,7 @@ describe('runtime', () => { .catch(err => { // print a clickable link to open the directory err.stack += `\n\ncmd-click: ${path.relative(process.cwd(), cwd)}/main.svelte`; + done(); throw err; }) .then(() => { @@ -255,6 +255,7 @@ describe('runtime', () => { flush(); if (config.after_test) config.after_test(); + done(); }); }); } diff --git a/test/server-side-rendering/index.ts b/test/server-side-rendering/index.ts index cc3f20d637..adf6b2cce0 100644 --- a/test/server-side-rendering/index.ts +++ b/test/server-side-rendering/index.ts @@ -52,7 +52,7 @@ describe('ssr', () => { throw new Error('Forgot to remove `solo: true` from test'); } - (solo ? it.only : it)(dir, () => { + (solo ? it.only : it)(dir, (done) => { dir = path.resolve(`${__dirname}/samples`, dir); cleanRequireCache(); @@ -131,6 +131,7 @@ describe('ssr', () => { err.stack += `\n\ncmd-click: ${path.relative(process.cwd(), dir)}/main.svelte`; throw err; } finally { + done(); set_current_component(null); } });