Remove deasync from integration tests and use async/await instead

Author: geowarin

.babelrc

@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-async-to-generator"]
+}

package.json

@@ -30,8 +30,8 @@
     "babel-core": "^6.23.1",
     "babel-eslint": "^7.1.1",
     "babel-loader": "^6.3.0",
+    "babel-plugin-transform-async-to-generator": "^6.22.0",
     "babel-preset-react": "^6.23.0",
-    "deasync": "^0.1.9",
     "eslint": "^3.15.0",
     "eslint-loader": "^1.6.1",
     "expect": "^1.20.2",
@@ -43,4 +43,4 @@
     "chalk": "^1.1.3",
     "error-stack-parser": "^2.0.0"
   }
-}
+}

test/integration.spec.js

@@ -1,40 +1,43 @@
 const output = require('../src/output');
-const deasync = require('deasync');
 const webpack = require('webpack');
 const FriendlyErrorsWebpackPlugin = require('../src/friendly-errors-plugin');
 const MemoryFileSystem = require('memory-fs');
 
-const syncWebpack = deasync(function(config, fn) {
+const webpackPromise = function(config, ...globalPlugins) {
   const compiler = webpack(config);
   compiler.outputFileSystem = new MemoryFileSystem();
-  compiler.run(fn);
-  return compiler;
-});
+  globalPlugins.forEach(p => compiler.apply(p));
+
+  return new Promise((resolve, reject) => {
+    compiler.run(err => {
+      if (err) {
+        reject(err)
+      }
+      resolve()
+    });
+  });
+};
 
-// Applys plugin directly to compiler to support `MultiCompiler` tests.
-const syncWebpackWithPlugin = deasync(function(config, fn) {
-  const compiler = webpack(config);
-  compiler.outputFileSystem = new MemoryFileSystem();
-  compiler.apply(new FriendlyErrorsWebpackPlugin());
-  compiler.run(fn);
-  return compiler;
-});
+async function executeAndGetLogs(fixture, ...globalPlugins) {
+  try {
+    output.capture();
+    await webpackPromise(require(fixture), ...globalPlugins);
+    return output.capturedMessages;
+  } finally {
+    output.endCapture()
+  }
+}
 
-it('integration : success', () => {
+it('integration : success', async () => {
 
-  const logs = output.captureLogs(() => {
-    syncWebpack(require('./fixtures/success/webpack.config'));
-  });
+  const logs = await executeAndGetLogs('./fixtures/success/webpack.config')
 
   expect(logs.join('\n')).toMatch(/DONE  Compiled successfully in (.\d*)ms/);
 });
 
+it('integration : module-errors', async () => {
 
-it('integration : module-errors', () => {
-
-  const logs = output.captureLogs(() => {
-    syncWebpack(require('./fixtures/module-errors/webpack.config.js'));
-  });
+  const logs = await executeAndGetLogs('./fixtures/module-errors/webpack.config.js');
 
   expect(logs).toEqual([
     ' ERROR  Failed to compile with 2 errors',
@@ -48,11 +51,9 @@ it('integration : module-errors', () => {
   ]);
 });
 
-it('integration : should display eslint warnings', () => {
+it('integration : should display eslint warnings', async () => {
 
-  const logs = output.captureLogs(() => {
-    syncWebpack(require('./fixtures/eslint-warnings/webpack.config.js'));
-  });
+  const logs = await executeAndGetLogs('./fixtures/eslint-warnings/webpack.config.js');
 
   expect(logs).toEqual([
     ' WARNING  Compiled with 1 warnings',
@@ -71,11 +72,9 @@ it('integration : should display eslint warnings', () => {
   ]);
 });
 
-it('integration : babel syntax error', () => {
+it('integration : babel syntax error', async () => {
 
-  const logs = output.captureLogs(() => {
-    syncWebpack(require('./fixtures/babel-syntax/webpack.config'));
-  });
+  const logs = await executeAndGetLogs('./fixtures/babel-syntax/webpack.config');
 
   expect(logs).toEqual([
     ' ERROR  Failed to compile with 1 errors',
@@ -94,20 +93,18 @@ it('integration : babel syntax error', () => {
   ]);
 });
 
-it('integration : webpack multi compiler : success', () => {
+it('integration : webpack multi compiler : success', async () => {
 
-  const logs = output.captureLogs(() => {
-    syncWebpackWithPlugin(require('./fixtures/multi-compiler-success/webpack.config'));
-  });
+  // We apply the plugin directly to the compiler when targeting multi-compiler
+  const logs = await executeAndGetLogs('./fixtures/multi-compiler-success/webpack.config', new FriendlyErrorsWebpackPlugin());
 
   expect(logs.join('\n')).toMatch(/DONE  Compiled successfully in (.\d*)ms/)
 });
 
-it('integration : webpack multi compiler : module-errors', () => {
+it('integration : webpack multi compiler : module-errors', async () => {
 
-  const logs = output.captureLogs(() => {
-    syncWebpackWithPlugin(require('./fixtures/multi-compiler-module-errors/webpack.config'));
-  });
+  // We apply the plugin directly to the compiler when targeting multi-compiler
+  const logs = await executeAndGetLogs('./fixtures/multi-compiler-module-errors/webpack.config', new FriendlyErrorsWebpackPlugin());
 
   expect(logs).toEqual([
     ' ERROR  Failed to compile with 2 errors',

yarn.lock

@@ -263,6 +263,33 @@ babel-helper-builder-react-jsx@^6.23.0:
     esutils "^2.0.0"
     lodash "^4.2.0"
 
+babel-helper-function-name@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
+  dependencies:
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-helper-get-function-arity@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-remap-async-to-generator@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.22.0.tgz#2186ae73278ed03b8b15ced089609da981053383"
+  dependencies:
+    babel-helper-function-name "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
 babel-helpers@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
@@ -306,6 +333,10 @@ babel-plugin-jest-hoist@^18.0.0:
   version "18.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-18.0.0.tgz#4150e70ecab560e6e7344adc849498072d34e12a"
 
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
 babel-plugin-syntax-flow@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
@@ -314,6 +345,14 @@ babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.13.0.tgz#e741ff3992c578310be45c571bcd90a2f9c5586e"
 
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.22.0"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-flow-strip-types@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
@@ -391,7 +430,7 @@ babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.16.0, babel-template@^6.23.0:
+babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
   dependencies:
@@ -401,7 +440,7 @@ babel-template@^6.16.0, babel-template@^6.23.0:
     babylon "^6.11.0"
     lodash "^4.2.0"
 
-babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
+babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
   version "6.23.1"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
   dependencies:
@@ -415,7 +454,7 @@ babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.23.0, babel-tr
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.23.0:
+babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.22.0, babel-types@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
   dependencies: