diff --git a/karma.conf.js b/karma.conf.js index ed3d462618..05413001d8 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,58 +1,72 @@ +// Karma configuration +// Generated on Sat Mar 28 2015 11:17:34 GMT-0700 (PDT) -// base path, that will be used to resolve files and exclude -basePath = '.'; - -// list of files / patterns to load in the browser -files = [ - JASMINE, - JASMINE_ADAPTER, - 'misc/test-lib/jquery-1.8.2.min.js', - 'misc/test-lib/angular.js', - 'misc/test-lib/angular-mocks.js', - 'misc/test-lib/helpers.js', - 'src/**/*.js', - 'template/**/*.js' -]; - -// list of files to exclude -exclude = [ - 'src/**/docs/*' -]; - -// Start these browsers, currently available: -// - Chrome -// - ChromeCanary -// - Firefox -// - Opera -// - Safari -// - PhantomJS -browsers = [ - 'Chrome' -]; - -// test results reporter to use -// possible values: dots || progress -reporters = ['progress']; - -reportSlowerThan = 100; - -// web server port -port = 9018; - -// cli runner port -runnerPort = 9100; - -// enable / disable colors in the output (reporters and logs) -colors = true; - -// level of logging -// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG -logLevel = LOG_INFO; - -// enable / disable watching file and executing tests whenever any file changes -autoWatch = false; - -// Continuous Integration mode -// if true, it capture browsers, run tests and exit -singleRun = false; +module.exports = function(config) { + config.set({ + // base path that will be used to resolve all patterns (eg. files, exclude) + basePath: '', + + + // frameworks to use + // available frameworks: https://npmjs.org/browse/keyword/karma-adapter + frameworks: ['jasmine'], + + + // list of files / patterns to load in the browser + files: [ + 'misc/test-lib/jquery-1.8.2.min.js', + 'misc/test-lib/angular.js', + 'misc/test-lib/angular-mocks.js', + 'misc/test-lib/helpers.js', + 'src/**/*.js', + 'template/**/*.js' + ], + + + // list of files to exclude + exclude: [ + 'src/**/docs/*' + ], + + + // preprocess matching files before serving them to the browser + // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor + preprocessors: { + }, + + + // test results reporter to use + // possible values: 'dots', 'progress' + // available reporters: https://npmjs.org/browse/keyword/karma-reporter + reporters: ['progress'], + + reportSlowerThan: 100, + + // web server port + port: 9876, + + + // enable / disable colors in the output (reporters and logs) + colors: true, + + + // level of logging + // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG + logLevel: config.LOG_INFO, + + + // enable / disable watching file and executing tests whenever any file changes + autoWatch: false, + + + // start these browsers + // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher + browsers: ['Chrome'], + + + // Continuous Integration mode + // if true, Karma captures browsers, runs the tests and exits + singleRun: false + }); +}; diff --git a/package.json b/package.json index 62dcc2415e..a3a5bd6975 100644 --- a/package.json +++ b/package.json @@ -9,20 +9,25 @@ "url": "https://github.com/angular-ui/bootstrap.git" }, "devDependencies": { - "grunt": "~0.4.1", - "grunt-ngdocs": "~0.1.1", + "grunt": "^0.4.5", + "grunt-contrib-concat": "^0.5.1", + "grunt-contrib-copy": "^0.8.0", + "grunt-contrib-jshint": "^0.11.1", + "grunt-contrib-uglify": "^0.8.0", + "grunt-contrib-watch": "^0.6.1", "grunt-conventional-changelog": "^1.1.0", - "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-copy": "~0.5.0", - "grunt-contrib-uglify": "~0.3.0", - "grunt-contrib-watch": "~0.5.0", - "grunt-contrib-jshint": "~0.8.0", - "grunt-html2js": "~0.2.0", - "grunt-karma": "~0.4.4", + "grunt-ddescribe-iit": "0.0.6", + "grunt-html2js": "^0.3.0", + "grunt-karma": "^0.10.1", + "grunt-ngdocs": "~0.1.1", + "karma": "^0.12.31", + "karma-chrome-launcher": "^0.1.7", + "karma-coverage": "^0.2.7", + "karma-firefox-launcher": "^0.1.4", + "karma-jasmine": "^0.1.5", "node-markdown": "0.1.1", - "semver": "~2.2.0", - "shelljs": "~0.2.0", - "grunt-ddescribe-iit": "0.0.4" + "semver": "^4.3.3", + "shelljs": "^0.4.0" }, "license": "MIT" }