From bcd9cfbf1fd01aa4547ef62e40f7d37716fb047a Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Thu, 25 Jun 2015 11:50:22 +0200 Subject: [PATCH] updated deps, removed unused karma --- .travis.yml | 1 - karma.conf.js | 95 --------------------------------------------------- package.json | 23 +++++-------- 3 files changed, 8 insertions(+), 111 deletions(-) delete mode 100644 karma.conf.js diff --git a/.travis.yml b/.travis.yml index 92fa1cf..175cd47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ script: - "jshint *.js lib" after_script: - npm run-script build - - npm run-script karma - npm run-script test-coveralls - cd test/node && npm install && node app.js diff --git a/karma.conf.js b/karma.conf.js deleted file mode 100644 index 9375315..0000000 --- a/karma.conf.js +++ /dev/null @@ -1,95 +0,0 @@ -// Karma configuration -// Generated on Thu Feb 19 2015 19:57:47 GMT+0100 (W. Europe Standard Time) - -module.exports = function (config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: true, logLevel: config.LOG_INFO, - //singleRun: true, logLevel: config.LOG_DEBUG, - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['browserify', 'mocha'], - - - // list of files / patterns to load in the browser - files: [ - 'test/*.js' - ], - - - // list of files to exclude - exclude: [ - ], - - client: { - mocha: { - //ui: 'tdd' - timeout: 5000 // especially for the post requests - } - }, - browserify: { - bundleDelay: 750, - debug: true - // transform: [], - // //extensions: ['.js'] - }, - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - 'test/*.js': ['browserify'] - }, - - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['dots'], - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: true, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - // // Chrome - // // PhantomJS - browsers: ['Chrome', 'Safari', 'Firefox'], - browserNoActivityTimeout: 10000, - browserDisconnectTimeout: 5000, - - customLaunchers: { - chromeWithoutSecurity: { - base: 'Chrome', - flags: ['--disable-web-security'] - }, - - IE9: { - base: 'IE', - 'x-ua-compatible': 'IE=EmulateIE9' - }, - IE8: { - base: 'IE', - 'x-ua-compatible': 'IE=EmulateIE8' - } - } - }); -}; diff --git a/package.json b/package.json index fc55a51..0f232a6 100644 --- a/package.json +++ b/package.json @@ -15,37 +15,30 @@ "browser": { }, "devDependencies": { - "bower": ">=1.3.0", + "bower": ">=1.4.1", "browserify": ">=10.0", - "chai": "^2.1.1", + "chai": "^3.0.0", "coveralls": "^2.11.2", - "del": ">=0.1.1", + "del": ">=1.2.0", "exorcist": "^0.4.0", - "gulp": ">=3.4.0", + "gulp": ">=3.9.0", "gulp-jshint": ">=1.5.0", "gulp-rename": ">=1.2.0", "gulp-replace": "^0.5.3", "gulp-streamify": "0.0.5", - "gulp-uglify": ">=1.0.0", + "gulp-uglify": ">=1.2.0", "istanbul": "^0.3.5", "jshint": ">=2.5.0", - "karma": "^0.12.31", - "karma-browserify": "^4.0.0", - "karma-chrome-launcher": "^0.1.7", - "karma-firefox-launcher": "^0.1.4", - "karma-mocha": "^0.1.10", - "karma-safari-launcher": "^0.1.1", "mocha": ">=2.1.0", - "sandboxed-module": "^2.0.0", - "vinyl-source-stream": "^1.0.0" + "sandboxed-module": "^2.0.2", + "vinyl-source-stream": "^1.1.0" }, "scripts": { "build": "gulp", "watch": "gulp watch", "lint": "jshint *.js lib", "test": "mocha", - "test-coveralls": "istanbul cover _mocha -- -R spec && cat coverage/lcov.info | coveralls --verbose", - "karma": "./node_modules/karma/bin/karma start --singleRun=true --browsers=\"Firefox\"" + "test-coveralls": "istanbul cover _mocha -- -R spec && cat coverage/lcov.info | coveralls --verbose" }, "repository": { "type": "git",