From 3b124f92e5d884d46c825b13e4ac4da092056a2b Mon Sep 17 00:00:00 2001 From: Akira Sudoh Date: Tue, 9 Jul 2019 21:48:00 +0900 Subject: [PATCH] chore(test): migrate away from done.fail() (#3309) `jest-circus`, the test runner we are using, does not seem to support Jasmine `done.fail()` API. Found in a CI for #3054. --- packages/components/tests/styles-test.js | 32 ++++++++++--------- .../components/DatePicker/DatePicker-test.js | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/components/tests/styles-test.js b/packages/components/tests/styles-test.js index aa3236707d0f..172003494faa 100644 --- a/packages/components/tests/styles-test.js +++ b/packages/components/tests/styles-test.js @@ -6,6 +6,7 @@ 'use strict'; const path = require('path'); +const { promisify } = require('util'); const sass = require('node-sass'); const glob = require('glob'); @@ -18,23 +19,24 @@ const files = glob.sync('**/*.scss', { ignore: ['**/vendor/@carbon/**'], }); +const render = promisify(sass.render); + describe('styles', () => { - it.each(files)('%s should compile', (relativeFilePath, done) => { + it.each(files)('%s should compile', async relativeFilePath => { const filepath = path.join(cwd, relativeFilePath); - sass.render( - { - file: filepath, - ...defaultOptions, - }, - (error, result) => { - if (error) { - const { column, line, message } = error; - done.fail(`${filepath}\n[${line}:${column}] ${message}`); - return; - } - expect(result.css).toBeDefined(); - done(); + try { + expect( + (await render({ + file: filepath, + ...defaultOptions, + })).css + ).toBeDefined(); + } catch (error) { + const { column, line, message } = error; + if (message) { + throw new Error(`${filepath}\n[${line}:${column}] ${message}`); } - ); + throw error; + } }); }); diff --git a/packages/react/src/components/DatePicker/DatePicker-test.js b/packages/react/src/components/DatePicker/DatePicker-test.js index ac9b46f55120..9de8353b7536 100644 --- a/packages/react/src/components/DatePicker/DatePicker-test.js +++ b/packages/react/src/components/DatePicker/DatePicker-test.js @@ -277,7 +277,7 @@ describe('DatePicker', () => { beforeEach(done => { const spy = {}; spy.console = jest.spyOn(console, 'error').mockImplementation(e => { - done.fail(e); + done(e); }); done(); });