aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--karma-docs.conf.js56
-rw-r--r--karma-e2e.conf.js35
-rw-r--r--karma-jqlite.conf.js22
-rw-r--r--karma-jquery.conf.js22
-rw-r--r--karma-modules.conf.js21
-rw-r--r--karma-shared.conf.js9
-rw-r--r--package.json7
7 files changed, 98 insertions, 74 deletions
diff --git a/karma-docs.conf.js b/karma-docs.conf.js
index 69192509..0403d187 100644
--- a/karma-docs.conf.js
+++ b/karma-docs.conf.js
@@ -1,36 +1,36 @@
-files = [
- JASMINE,
- JASMINE_ADAPTER,
+var sharedConfig = require('./karma-shared.conf');
- 'build/docs/components/jquery.js',
- 'test/jquery_remove.js',
+module.exports = function(config) {
+ sharedConfig(config);
- 'build/angular.js',
- 'build/angular-cookies.js',
- 'build/angular-mocks.js',
- 'build/angular-resource.js',
- 'build/angular-mobile.js',
- 'build/angular-sanitize.js',
- 'build/angular-route.js',
+ config.set({
+ files: [
+ 'build/docs/components/jquery.js',
+ 'test/jquery_remove.js',
- 'build/docs/components/lib/lunr.js/lunr.js',
- 'build/docs/components/lib/google-code-prettify/src/prettify.js',
- 'build/docs/components/showdown.js',
+ 'build/angular.js',
+ 'build/angular-cookies.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/angular-bootstrap-prettify.js',
- 'build/docs/js/docs.js',
- 'build/docs/docs-data.js',
+ 'build/docs/components/lib/lunr.js/lunr.js',
+ 'build/docs/components/lib/google-code-prettify/src/prettify.js',
+ 'build/docs/components/showdown.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;
-logLevel = LOG_INFO;
-logColors = true;
-browsers = ['Chrome'];
+ 'docs/component-spec/*.js'
+ ],
-junitReporter = {
- outputFile: 'test_out/docs.xml',
- suite: 'Docs'
+ junitReporter: {
+ outputFile: 'test_out/docs.xml',
+ suite: 'Docs'
+ }
+ });
};
diff --git a/karma-e2e.conf.js b/karma-e2e.conf.js
index d70d8522..2c87820c 100644
--- a/karma-e2e.conf.js
+++ b/karma-e2e.conf.js
@@ -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;
-singleRun = true;
-logLevel = LOG_INFO;
-logColors = true;
-browsers = ['Chrome'];
+ config.set({
+ frameworks: [],
+ files: [
+ 'build/angular-scenario.js',
+ 'node_modules/karma-ng-scenario/lib/adapter.js',
+ 'build/docs/docs-scenario.js'
+ ],
-proxies = {
- // angular.js, angular-resource.js, etc
- '/angular': 'http://localhost:8000/build/angular',
- '/': 'http://localhost:8000/build/docs/'
-};
+ 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'
+ junitReporter: {
+ outputFile: 'test_out/e2e.xml',
+ suite: 'E2E'
+ }
+ });
};
diff --git a/karma-jqlite.conf.js b/karma-jqlite.conf.js
index 6cb98114..9284f491 100644
--- a/karma-jqlite.conf.js
+++ b/karma-jqlite.conf.js
@@ -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'
+ }
+ });
};
diff --git a/karma-jquery.conf.js b/karma-jquery.conf.js
index 7b527a15..28f2fae2 100644
--- a/karma-jquery.conf.js
+++ b/karma-jquery.conf.js
@@ -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'
+ }
+ });
};
diff --git a/karma-modules.conf.js b/karma-modules.conf.js
index 9fea7d58..f4c28eb3 100644
--- a/karma-modules.conf.js
+++ b/karma-modules.conf.js
@@ -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'
+ }
+ });
};
diff --git a/karma-shared.conf.js b/karma-shared.conf.js
new file mode 100644
index 00000000..70be8c97
--- /dev/null
+++ b/karma-shared.conf.js
@@ -0,0 +1,9 @@
+module.exports = function(config) {
+ config.set({
+ frameworks: ['jasmine'],
+ autoWatch: true,
+ logLevel: config.LOG_INFO,
+ logColors: true,
+ browsers: ['Chrome']
+ });
+};
diff --git a/package.json b/package.json
index c729906e..68a0b7ec 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,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",
"rewire": "1.1.3",
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 13:46:40 +0000