From db4880162d4c51e10a6925ac9cfec63eb5705694 Mon Sep 17 00:00:00 2001 From: Rey Dhuny Date: Mon, 12 Aug 2013 16:36:16 +0100 Subject: [PATCH] update karma config files because out of date --- config/karma-e2e.conf.js | 36 ++++++++++++++++++++---------------- config/karma.conf.js | 34 +++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/config/karma-e2e.conf.js b/config/karma-e2e.conf.js index 51f51d2ee3..d4274d8791 100644 --- a/config/karma-e2e.conf.js +++ b/config/karma-e2e.conf.js @@ -1,22 +1,26 @@ -basePath = '../'; +module.exports = function(config) { + config.set({ + basePath: '../', -files = [ - ANGULAR_SCENARIO, - ANGULAR_SCENARIO_ADAPTER, - 'test/e2e/**/*.js' -]; + frameworks: ["requirejs"], -autoWatch = false; + files: [ + 'test/e2e/**/*.js' + ], -browsers = ['Chrome']; + autoWatch: false, -singleRun = true; + browsers: ['Chrome'], -proxies = { - '/': 'http://localhost:8000/' -}; + singleRun: true, -junitReporter = { - outputFile: 'test_out/e2e.xml', - suite: 'e2e' -}; + proxies: { + '/': 'http://localhost:8000/' + }, + + junitReporter: { + outputFile: 'test_out/e2e.xml', + suite: 'e2e' + }, + }); +} diff --git a/config/karma.conf.js b/config/karma.conf.js index ad0ade4777..3ec9bbec60 100644 --- a/config/karma.conf.js +++ b/config/karma.conf.js @@ -1,20 +1,24 @@ -basePath = '../'; +module.exports = function(config) { + config.set({ + basePath: '../', -files = [ - JASMINE, - JASMINE_ADAPTER, - 'app/lib/angular/angular.js', - 'app/lib/angular/angular-*.js', - 'test/lib/angular/angular-mocks.js', - 'app/js/**/*.js', - 'test/unit/**/*.js' -]; + frameworks: ["jasmine"], -autoWatch = true; + files: [ + 'app/lib/angular/angular.js', + 'app/lib/angular/angular-*.js', + 'test/lib/angular/angular-mocks.js', + 'app/js/**/*.js', + 'test/unit/**/*.js' + ], -browsers = ['Chrome']; + autoWatch: true, -junitReporter = { - outputFile: 'test_out/unit.xml', - suite: 'unit' + browsers: ['Chrome'], + + junitReporter: { + outputFile: 'test_out/unit.xml', + suite: 'unit' + }, + }); };