diff --git a/Gruntfile.js b/Gruntfile.js index e66674ac..01b0776c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -55,7 +55,6 @@ module.exports = function(grunt) { browsers: TEST_BROWSERS, browserify: { - watch: false, debug: false, transform: [ 'brfs' ] } diff --git a/package.json b/package.json index 149bb65c..ff62a3db 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ } ], "devDependencies": { - "grunt": "^0.4.4", + "grunt": "~0.4.4", "grunt-contrib-watch": "~0.5.0", "grunt-contrib-connect": "~0.6.0", "grunt-contrib-jshint": "~0.7.2", @@ -50,9 +50,9 @@ "karma-jasmine": "https://github.com/Nikku/karma-jasmine/archive/jasmine-v2.0.0-latest-1.tar.gz", "karma-chrome-launcher": "~0.1.2", "karma-phantomjs-launcher": "0.1.2", - "karma-ie-launcher": "^0.1.4", - "karma-firefox-launcher": "^0.1.3", - "karma-browserify": "~0.2.0", + "karma-ie-launcher": "~0.1.4", + "karma-firefox-launcher": "~0.1.3", + "karma-bro": "~0.1.0", "jsondiffpatch": "~0.1.4", "xsd-schema-validator": "0.0.3", "sax": "~0.6.0", @@ -72,6 +72,6 @@ "lodash": "~2.4.0", "didi": "~0.0.4", "jquery": "~2.1.0", - "jquery-mousewheel": "^3.1.11" + "jquery-mousewheel": "~3.1.11" } } diff --git a/test/config/karma.unit.js b/test/config/karma.unit.js index 69dd89b7..2717ce71 100644 --- a/test/config/karma.unit.js +++ b/test/config/karma.unit.js @@ -3,12 +3,12 @@ module.exports = function(karma) { basePath: '../../', - frameworks: [ 'jasmine', 'browserify' ], + frameworks: [ 'browserify', 'jasmine' ], files: [ 'test/spec/browser/**/*Spec.js' ], - + reporters: [ 'dots' ], preprocessors: { @@ -17,16 +17,12 @@ module.exports = function(karma) { browsers: [ 'PhantomJS' ], - // fixing slow browserify build - browserNoActivityTimeout: 60000, - singleRun: false, autoWatch: true, // browserify configuration browserify: { debug: true, - watch: true, transform: [ 'brfs' ] } });