Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-10 07:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: update karma to 0.9.4

Browse source 
And also add shared config to make karma configs a bit simpler.
This commit is contained in:
Vojta Jina 2013-06-25 11:48:10 -07:00
parent 89efb12ed8
commit 29f96c852c
7 changed files with 99 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
karma-docs.conf.js
View file

@ -1,36 +1,36 @@
files = [ var sharedConfig = require('./karma-shared.conf');
JASMINE,
JASMINE_ADAPTER,
'build/docs/components/jquery.js', module.exports = function(config) {
'test/jquery_remove.js', sharedConfig(config);
'build/angular.js', config.set({
'build/angular-cookies.js', files: [
'build/angular-mocks.js', 'build/docs/components/jquery.js',
'build/angular-resource.js', 'test/jquery_remove.js',
'build/angular-mobile.js',
'build/angular-sanitize.js',
'build/angular-route.js',
'build/docs/components/lib/lunr.js/lunr.js', 'build/angular.js',
'build/docs/components/lib/google-code-prettify/src/prettify.js', 'build/angular-cookies.js',
'build/docs/components/showdown.js', 'build/angular-mocks.js',
'build/angular-resource.js',
'build/angular-mobile.js',
'build/angular-sanitize.js',
'build/angular-route.js',
'build/docs/components/angular-bootstrap.js', 'build/docs/components/lib/lunr.js/lunr.js',
'build/docs/components/angular-bootstrap-prettify.js', 'build/docs/components/lib/google-code-prettify/src/prettify.js',
'build/docs/js/docs.js', 'build/docs/components/showdown.js',
'build/docs/docs-data.js',
'docs/component-spec/*.js' 'build/docs/components/angular-bootstrap.js',
]; 'build/docs/components/angular-bootstrap-prettify.js',
'build/docs/js/docs.js',
'build/docs/docs-data.js',
autoWatch = true; 'docs/component-spec/*.js'
logLevel = LOG_INFO; ],
logColors = true;
browsers = ['Chrome'];
junitReporter = { junitReporter: {
outputFile: 'test_out/docs.xml', outputFile: 'test_out/docs.xml',
suite: 'Docs' suite: 'Docs'
}
});
}; };

37
karma-e2e.conf.js
View file

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

22
karma-jqlite.conf.js
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'); module.exports = function(config) {
exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdExclude); sharedConfig(config);
autoWatch = true; config.set({
logLevel = LOG_INFO; files: angularFiles.mergeFiles('jstd'),
logColors = true; exclude: angularFiles.files.jstdExclude,
browsers = ['Chrome'];
junitReporter = { junitReporter: {
outputFile: 'test_out/jqlite.xml', outputFile: 'test_out/jqlite.xml',
suite: 'jqLite' suite: 'jqLite'
}
});
}; };

22
karma-jquery.conf.js
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'); module.exports = function(config) {
exclude = ['**/*jasmine*/**', '**/*jstd*/**'].concat(angularFiles.files.jstdJqueryExclude); sharedConfig(config);
autoWatch = true; config.set({
logLevel = LOG_INFO; files: angularFiles.mergeFiles('jstdJquery'),
logColors = true; exclude: angularFiles.files.jstdJqueryExclude,
browsers = ['Chrome'];
junitReporter = { junitReporter: {
outputFile: 'test_out/jquery.xml', outputFile: 'test_out/jquery.xml',
suite: 'jQuery' suite: 'jQuery'
}
});
}; };

21
karma-modules.conf.js
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'); module.exports = function(config) {
exclude = ['**/*jasmine*/**', '**/*jstd*/**']; sharedConfig(config);
autoWatch = true; config.set({
logLevel = LOG_INFO; files: angularFiles.mergeFiles('jstdModules', 'angularSrcModules'),
logColors = true;
browsers = ['Chrome'];
junitReporter = { junitReporter: {
outputFile: 'test_out/modules.xml', outputFile: 'test_out/modules.xml',
suite: 'modules' 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']
});
};

7
package.json
View file

@ -16,7 +16,12 @@
"q-fs": "0.1.36", "q-fs": "0.1.36",
"qq": "0.3.5", "qq": "0.3.5",
"shelljs": "0.1.2", "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", "yaml-js": "0.0.5",
"showdown": "0.3.1", "showdown": "0.3.1",
"rewire": "1.1.3", "rewire": "1.1.3",