Skip to content

Commit

Permalink
Upgraded to karma 0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
passy committed Jul 13, 2013
1 parent 5367191 commit 1917696
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 115 deletions.
118 changes: 62 additions & 56 deletions karma-ci.conf.js
Original file line number Diff line number Diff line change
@@ -1,68 +1,74 @@
// Karma configuration

// base path, that will be used to resolve files and exclude
basePath = '';

// list of files / patterns to load in the browser
files = [
MOCHA,
MOCHA_ADAPTER,
'components/chai/chai.js',
'components/uri.js/src/URI.js',
'components/uri.js/src/URITemplate.js',
'components/q/q.js',
'dist/hyperagent.js',
'test/setup.js',
'test/lib/utils.js',
'test/fixtures/**/*.js',
'test/spec/**/*.js'
];

// list of files to exclude
exclude = [];

preprocessors = {
'dist/hyperagent.js': 'coverage'
};
module.exports = function (config) {
'use strict';

config.set({
// base path, that will be used to resolve files and exclude
basePath: '',

frameworks: ['mocha'],

// list of files / patterns to load in the browser
files: [
'components/chai/chai.js',
'components/uri.js/src/URI.js',
'components/uri.js/src/URITemplate.js',
'components/q/q.js',
'dist/hyperagent.js',
'test/setup.js',
'test/lib/utils.js',
'test/fixtures/**/*.js',
'test/spec/**/*.js'
],

// test results reporter to use
// possible values: dots || progress || growl
reporters = ['coverage', 'progress'];
// list of files to exclude
exclude: [],

coverageReporter = {
type: 'lcov',
dir: 'coverage/'
}
preprocessors: {
'dist/hyperagent.js': 'coverage'
},

// web server port
port = 8080;
coverageReporter: {
type: 'lcov',
dir: 'coverage/'
},

// cli runner port
runnerPort = 9100;
// test results reporter to use
// possible values: dots || progress || growl
reporters: ['coverage', 'progress'],

// enable / disable colors in the output (reporters and logs)
colors = true;
// web server port
port: 8080,

// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_INFO;
// cli runner port
runnerPort: 9100,

// enable / disable watching file and executing tests whenever any file changes
autoWatch = false;
// enable / disable colors in the output (reporters and logs)
colors: true,

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers = ['PhantomJS'];
// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel: config.LOG_INFO,

// If browser does not capture in given timeout [ms], kill it
captureTimeout = 5000;
// 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;
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers: ['PhantomJS'],

// If browser does not capture in given timeout [ms], kill it
captureTimeout: 5000,

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: false
});
};
120 changes: 63 additions & 57 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,59 +1,65 @@
// Karma configuration

// base path, that will be used to resolve files and exclude
basePath = '';

// list of files / patterns to load in the browser
files = [
MOCHA,
MOCHA_ADAPTER,
'components/chai/chai.js',
'components/uri.js/src/URI.js',
'components/uri.js/src/URITemplate.js',
'components/q/q.js',
'dist/hyperagent.js',
'test/setup.js',
'test/lib/utils.js',
'test/fixtures/**/*.js',
'test/spec/**/*.js'
];

// list of files to exclude
exclude = [];

// test results reporter to use
// possible values: dots || progress || growl
reporters = ['progress'];

// web server port
port = 8080;

// 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;

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers = ['PhantomJS', 'Chrome', 'Firefox'];

// If browser does not capture in given timeout [ms], kill it
captureTimeout = 5000;

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun = false;
module.exports = function (config) {
'use strict';

config.set({
// base path, that will be used to resolve files and exclude
basePath: '',

frameworks: ['mocha'],

// list of files / patterns to load in the browser
files: [
'components/chai/chai.js',
'components/uri.js/src/URI.js',
'components/uri.js/src/URITemplate.js',
'components/q/q.js',
'dist/hyperagent.js',
'test/setup.js',
'test/lib/utils.js',
'test/fixtures/**/*.js',
'test/spec/**/*.js'
],

// list of files to exclude
exclude: [],

// test results reporter to use
// possible values: dots || progress || growl
reporters: ['progress'],

// web server port
port: 8080,

// 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: config.LOG_INFO,

// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,

// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers: ['PhantomJS', 'Chrome', 'Firefox'],

// If browser does not capture in given timeout [ms], kill it
captureTimeout: 5000,

// Continuous Integration mode
// if true, it capture browsers, run tests and exit
singleRun: false
});
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"lodash": "~1.3.0",
"grunt-contrib-connect": "~0.3.0",
"grunt-devtools": "~0.1.0-7",
"karma-mocha": "0.0.1",
"grunt-karma": "~0.4.0",
"karma-mocha": "0.0.3",
"grunt-karma": "~0.5.0",
"grunt-open": "~0.2.0",
"coveralls": "~2.0.7"
},
Expand Down

0 comments on commit 1917696

Please sign in to comment.