Change options to query. Increase timeout interval

babel · Oct 30, 2015 · a6f3fc0 · a6f3fc0
1 parent 94d6308
commit a6f3fc0
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/test/cache.test.js b/test/cache.test.js
@@ -11,6 +11,8 @@ var webpack = require('webpack');
 
 describe('Filesystem Cache', function() {
 
+  this.timeout(3000);
+
   var cacheDir = path.resolve(__dirname, 'output/cache/cachefiles');
   var outputDir = path.resolve(__dirname, './output/cache/');
   var babelLoader = path.resolve(__dirname, '../');
@@ -42,14 +44,18 @@ describe('Filesystem Cache', function() {
 
   it('should output files to cache directory', function(done) {
 
-    var loader = babelLoader + '?presets[]=es2015&cacheDirectory=' + cacheDir;
+    var loader = babelLoader;
     var config = assign({}, globalConfig, {
       module: {
         loaders: [
           {
             test: /\.jsx?/,
             loader: loader,
             exclude: /node_modules/,
+            query: {
+              cacheDirectory: cacheDir,
+              presets: ['es2015'],
+            },
           },
         ],
       },
@@ -72,8 +78,12 @@ describe('Filesystem Cache', function() {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?presets[]=es2015cacheDirectory',
+            loader: babelLoader,
             exclude: /node_modules/,
+            query: {
+              cacheDirectory: cacheDir,
+              presets: ['es2015'],
+            },
           },
         ],
       },
@@ -96,14 +106,18 @@ describe('Filesystem Cache', function() {
   });
 
   it('should read from cache directory if cached file exists', function(done) {
-    var loader = babelLoader + '?presets[]=es2015&cacheDirectory=' + cacheDir;
+    var loader = babelLoader;
     var config = assign({}, globalConfig, {
       module: {
         loaders: [
           {
             test: /\.jsx?/,
             loader: loader,
             exclude: /node_modules/,
+            query: {
+              cacheDirectory: cacheDir,
+              presets: ['es2015'],
+            },
           },
         ],
       },
@@ -127,14 +141,18 @@ describe('Filesystem Cache', function() {
   });
 
   it('should have one file per module', function(done) {
-    var loader = babelLoader + '?presets[]=es2015&cacheDirectory=' + cacheDir;
+    var loader = babelLoader;
     var config = assign({}, globalConfig, {
       module: {
         loaders: [
           {
             test: /\.jsx?/,
             loader: loader,
             exclude: /node_modules/,
+            query: {
+              cacheDirectory: cacheDir,
+              presets: ['es2015'],
+            },
           },
         ],
       },

diff --git a/test/loader.test.js b/test/loader.test.js
@@ -10,6 +10,8 @@ var webpack = require('webpack');
 
 describe('Loader', function() {
 
+  this.timeout(3000); // @TODO this is worrisome
+
   var outputDir = path.resolve(__dirname, './output/loader');
   var babelLoader = path.resolve(__dirname, '../');
   var globalConfig = {
@@ -23,6 +25,9 @@ describe('Loader', function() {
         {
           test: /\.jsx?/,
           loader: babelLoader,
+          query: {
+            presets: ['es2015'],
+          },
           exclude: /node_modules/,
         },
       ],
@@ -45,7 +50,10 @@ describe('Loader', function() {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?presets[]=es2015',
+            loader: babelLoader,
+            query: {
+              presets: ['es2015'],
+            },
             exclude: /node_modules/,
           },
         ],
@@ -78,7 +86,10 @@ describe('Loader', function() {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?presets[]=es2015',
+            loader: babelLoader,
+            query: {
+              presets: ['es2015'],
+            },
             exclude: /node_modules/,
           },
         ],