aboutsummaryrefslogtreecommitdiffstats
path: root/karma-e2e.conf.js
diff options
context:
space:
mode:
authorVojta Jina2013-06-25 11:48:10 -0700
committerVojta Jina2013-06-28 11:43:38 -0700
commit29f96c852c355d0e283a64111d4923d1bcde8f5f (patch)
treefc40a3fec38f8245917b979a6216aa272c8cd5fa /karma-e2e.conf.js
parent89efb12ed852070a93777c5ff0ed3f9bc822bdf0 (diff)
downloadangular.js-29f96c852c355d0e283a64111d4923d1bcde8f5f.tar.bz2
chore: update karma to 0.9.4
And also add shared config to make karma configs a bit simpler.
Diffstat (limited to 'karma-e2e.conf.js')
-rw-r--r--karma-e2e.conf.js35
1 files changed, 20 insertions, 15 deletions
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'
+ }
+ });
};