chore: update karma to 0.9.4

And also add shared config to make karma configs a bit simpler.
This commit is contained in:
Vojta Jina 2013-06-28 16:30:48 -07:00
parent 2fae296cbc
commit 4fbd4bbd8d
6 changed files with 69 additions and 47 deletions

View file

@ -1,20 +1,23 @@
var angularFiles = require(__dirname + '/angularFiles.js');
var sharedConfig = require('./karma-shared.conf');
files = [ANGULAR_SCENARIO, ANGULAR_SCENARIO_ADAPTER, 'build/docs/docs-scenario.js'];
module.exports = function(config) {
sharedConfig(config);
autoWatch = false;
singleRun = true;
logLevel = LOG_INFO;
logColors = true;
browsers = ['Chrome'];
config.set({
frameworks: ['ng-scenario'],
files: [
'build/docs/docs-scenario.js'
],
proxies = {
// angular.js, angular-resource.js, etc
'/angular': 'http://localhost:8000/build/angular',
'/': 'http://localhost:8000/build/docs/'
};
junitReporter = {
outputFile: 'test_out/e2e.xml',
suite: 'E2E'
proxies: {
// angular.js, angular-resource.js, etc
'/angular': 'http://localhost:8000/build/angular',
'/': 'http://localhost:8000/build/docs/'
},
junitReporter: {
outputFile: 'test_out/e2e.xml',
suite: 'E2E'
}
});
};

View file

@ -1,14 +1,16 @@
var angularFiles = require(__dirname + '/angularFiles.js');
var angularFiles = require('./angularFiles');
var sharedConfig = require('./karma-shared.conf');
files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstd');
exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdExclude);
module.exports = function(config) {
sharedConfig(config);
autoWatch = true;
logLevel = LOG_INFO;
logColors = true;
browsers = ['Chrome'];
config.set({
files: angularFiles.mergeFiles('jstd'),
exclude: angularFiles.files.jstdExclude,
junitReporter = {
outputFile: 'test_out/jqlite.xml',
suite: 'jqLite'
junitReporter: {
outputFile: 'test_out/jqlite.xml',
suite: 'jqLite'
}
});
};

View file

@ -1,14 +1,16 @@
var angularFiles = require(__dirname + '/angularFiles.js');
var angularFiles = require('./angularFiles');
var sharedConfig = require('./karma-shared.conf');
files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstdJquery');
exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdJqueryExclude);
module.exports = function(config) {
sharedConfig(config);
autoWatch = true;
logLevel = LOG_INFO;
logColors = true;
browsers = ['Chrome'];
config.set({
files: angularFiles.mergeFiles('jstdJquery'),
exclude: angularFiles.files.jstdJqueryExclude,
junitReporter = {
outputFile: 'test_out/jquery.xml',
suite: 'jQuery'
junitReporter: {
outputFile: 'test_out/jquery.xml',
suite: 'jQuery'
}
});
};

View file

@ -1,14 +1,15 @@
var angularFiles = require(__dirname + '/angularFiles.js');
var angularFiles = require('./angularFiles');
var sharedConfig = require('./karma-shared.conf');
files = angularFiles.mergeFiles(JASMINE, JASMINE_ADAPTER, 'jstdModules', 'angularSrcModules');
exclude = ['**/*jasmine*/**', '**/*jstd*/**'];
module.exports = function(config) {
sharedConfig(config);
autoWatch = true;
logLevel = LOG_INFO;
logColors = true;
browsers = ['Chrome'];
config.set({
files: angularFiles.mergeFiles('jstdModules', 'angularSrcModules'),
junitReporter = {
outputFile: 'test_out/modules.xml',
suite: 'modules'
junitReporter: {
outputFile: 'test_out/modules.xml',
suite: 'modules'
}
});
};

9
karma-shared.conf.js Normal file
View file

@ -0,0 +1,9 @@
module.exports = function(config) {
config.set({
frameworks: ['jasmine'],
autoWatch: true,
logLevel: config.LOG_INFO,
logColors: true,
browsers: ['Chrome']
});
};

View file

@ -14,7 +14,12 @@
"q-fs": "0.1.36",
"qq": "0.3.5",
"shelljs": "0.1.2",
"karma": "0.8.4",
"karma": "~0.9.4",
"karma-jasmine": "~0.0.1",
"karma-chrome-launcher": "~0.0.2",
"karma-firefox-launcher": "~0.0.1",
"karma-ng-scenario": "~0.0.1",
"karma-junit-reporter": "~0.0.1",
"yaml-js": "0.0.5",
"showdown": "0.3.1"
},