Use webpack for testing

alferov · Feb 25, 2016 · 25f2283 · 25f2283
1 parent 58d3965
commit 25f2283
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -3,9 +3,9 @@
 module.exports = function(config) {
   config.set({
     basePath: './',
-    frameworks: ['jasmine', 'browserify'],
+    frameworks: ['jasmine'],
     preprocessors: {
-      'src/**/*.js': ['browserify']
+      'src/**/*.js': ['webpack']
     },
     browsers: ['Chrome', 'Firefox'],
     nyanReporter: {
@@ -14,10 +14,6 @@ module.exports = function(config) {
       numberOfRainbowLines: 4
     },
     autoWatch: false,
-    browserify: {
-      debug: true,
-      transform: []
-    },
     proxies: {
       '/': 'http://localhost:9876/'
     },

diff --git a/package.json b/package.json
@@ -48,10 +48,10 @@
     "husky": "^0.9.3",
     "jasmine-core": "^2.3.4",
     "karma": "^0.13.9",
-    "karma-browserify": "^4.3.0",
     "karma-chrome-launcher": "^0.2.0",
     "karma-firefox-launcher": "^0.1.6",
     "karma-jasmine": "^0.3.6",
+    "karma-webpack": "^1.7.0",
     "run-sequence": "^1.1.2",
     "webpack-stream": "^3.1.0"
   },