rework run tests

TargetProcess · Mar 4, 2015 · a6de542 · a6de542
1 parent d1049a9
commit a6de542
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 72 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,8 @@
 /*global module:false*/
 var autoprefixer = require('autoprefixer-core');
 var webpack = require('webpack');
+var webpackConfig = require('./config/webpack.test.config');
+webpackConfig.module.postLoaders = [];
 module.exports = function (grunt) {
     // Project configuration.
     var src = [
@@ -74,17 +76,14 @@ module.exports = function (grunt) {
             dev: {
                 reporters: ['dots'],
                 browsers: ['Chrome'],
-                singleRun: false
+                singleRun: false,
+                webpack: webpackConfig
             },
             unit: {
                 reporters: [
                     'dots',
-                   'coverage'
+                    'coverage'
                 ],
-                /*preprocessors: {
-                    'tau_modules/!**!/!*.js': 'coverage',
-                    'plugins/!*.js': 'coverage'
-                },*/
                 coverageReporter: {}
             }
         },
@@ -250,7 +249,6 @@ module.exports = function (grunt) {
                     'd3.js': 'd3/d3.js',
                     'underscore.js': 'underscore/underscore.js',
                     'jquery.js': 'jquery/dist/jquery.js',
-                    'modernizer.js': 'modernizer/modernizr.js',
                     'js-schema.js': 'js-schema/js-schema.debug.js',
                     'es5-shim.js': 'es5-shim/es5-shim.js'
                 }

diff --git a/config/karma.conf.js b/config/karma.conf.js
@@ -1,7 +1,5 @@
 module.exports = function (config) {
-    var path = require('path');
-    var webpack = require('webpack');
-    console.log(path.resolve('.'));
+    var webpackConfig = require('./webpack.test.config');
     config.set({
 
         // base path, that will be used to resolve files and exclude
@@ -28,68 +26,7 @@ module.exports = function (config) {
         webpackMiddleware: {
            noInfo: true
         },
-        webpack: {
-            resolve: {
-                root: [
-                    path.resolve('.')
-                ],
-                modulesDirectories: [
-                    'bower_components',
-                    'node_modules'
-                ],
-                alias: {
-                    'schemes': 'test/utils/schemes.js',
-                    'testUtils': 'test/utils/utils.js',
-                    'es5-shim': 'libs/es5-shim.js',
-                    'brewer': 'src/addons/color-brewer.js',
-                    'tauCharts': 'src/tau.charts.js',
-                    'print.style.css': 'plugins/print.style.css',
-                    'rgbcolor': 'bower_components/canvg/rgbcolor.js',
-                    'stackblur': 'bower_components/canvg/StackBlur.js',
-                    'canvg': 'bower_components/canvg/canvg.js',
-                    'FileSaver': 'test/utils/saveAs.js',
-                    'fetch': 'bower_components/fetch/fetch.js',
-                    'promise': 'bower_components/es6-promise/promise.js'
-                },
-                extensions: ['', '.js', '.json']
-            },
-            devtool: 'inline-source-map',
-            module: {
-                loaders: [
-                    {test: /\.css$/, loader: 'css-loader'},
-                    {
-                        test: /modernizer[\\\/]modernizr\.js$/,
-                        loader: 'imports?this=>window!exports?window.Modernizr'
-                    },
-                    {
-                        test: /\.js$/,
-                        exclude: /node_modules|libs|bower_components/,
-                        loader: 'babel-loader'
-                    }
-                ],
-                 postLoaders: [{ // << add subject as webpack's postloader
-                 test: /\.js$/,
-                 exclude: /test|plugins|node_modules|bower_components|libs\//,
-                 loader: 'istanbul-instrumenter'
-                 }]
-            },
-            externals: {
-                _: 'underscore'
-            },
-
-            plugins: [
-                new webpack.ProvidePlugin({
-                    d3: 'd3',
-                    _: 'underscore'
-                })
-            ],
-            debug: false,
-            stats: {
-                colors: true,
-                reasons: true
-            },
-            progress: true
-        },
+        webpack: webpackConfig,
         browserNoActivityTimeout: 100000,
         port: 9876,
 

diff --git a/config/webpack.test.config.js b/config/webpack.test.config.js
@@ -0,0 +1,64 @@
+var webpack = require('webpack');
+var path = require('path');
+module.exports = {
+    resolve: {
+        root: [
+            path.resolve('.')
+        ],
+        modulesDirectories: [
+            'bower_components',
+            'node_modules'
+        ],
+        alias: {
+            'schemes': 'test/utils/schemes.js',
+            'testUtils': 'test/utils/utils.js',
+            'es5-shim': 'libs/es5-shim.js',
+            'brewer': 'src/addons/color-brewer.js',
+            'tauCharts': 'src/tau.charts.js',
+            'print.style.css': 'plugins/print.style.css',
+            'rgbcolor': 'bower_components/canvg/rgbcolor.js',
+            'stackblur': 'bower_components/canvg/StackBlur.js',
+            'canvg': 'bower_components/canvg/canvg.js',
+            'FileSaver': 'test/utils/saveAs.js',
+            'fetch': 'bower_components/fetch/fetch.js',
+            'promise': 'bower_components/es6-promise/promise.js'
+        },
+        extensions: ['', '.js', '.json']
+    },
+    devtool: 'inline-source-map',
+    module: {
+        loaders: [
+            {test: /\.css$/, loader: 'css-loader'},
+            {
+                test: /modernizer[\\\/]modernizr\.js$/,
+                loader: 'imports?this=>window!exports?window.Modernizr'
+            },
+            {
+                test: /\.js$/,
+                exclude: /node_modules|libs|bower_components/,
+                loader: 'babel-loader'
+            }
+        ],
+        postLoaders: [{ // << add subject as webpack's postloader
+            test: /\.js$/,
+            exclude: /test|addons|plugins|node_modules|bower_components|libs\//,
+            loader: 'istanbul-instrumenter'
+        }]
+    },
+    externals: {
+        _: 'underscore'
+    },
+
+    plugins: [
+        new webpack.ProvidePlugin({
+            d3: 'd3',
+            _: 'underscore'
+        })
+    ],
+    debug: false,
+    stats: {
+        colors: true,
+        reasons: true
+    },
+    progress: true
+};