From cee54b4785e62380ef01a848429c29c369e7efe2 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 29 Nov 2013 16:44:27 +1100 Subject: [PATCH] Convert Karma config file to v0.10 compatible format --- config/ng-test.conf.js | 44 ++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/config/ng-test.conf.js b/config/ng-test.conf.js index 25c23ff83c..13b67ec688 100644 --- a/config/ng-test.conf.js +++ b/config/ng-test.conf.js @@ -1,25 +1,35 @@ -basePath = '../'; +module.exports = function(config) { + config.set({ + basePath: '../', -files = [ - JASMINE, - JASMINE_ADAPTER, - 'app/assets/javascripts/shared/jquery-1.8.0.js', // TODO: Can we link to Rails' jquery? - 'app/assets/javascripts/shared/angular.js', - 'app/assets/javascripts/shared/angular-*.js', + frameworks: ['jasmine'], - 'app/assets/javascripts/admin/order_cycle.js.erb.coffee', - 'app/assets/javascripts/admin/bulk_product_update.js.coffee', + files: [ + 'app/assets/javascripts/shared/jquery-1.8.0.js', // TODO: Can we link to Rails' jquery? + 'app/assets/javascripts/shared/angular.js', + 'app/assets/javascripts/shared/angular-*.js', - 'spec/javascripts/unit/**/*.js*' -]; + 'app/assets/javascripts/admin/order_cycle.js.erb.coffee', + 'app/assets/javascripts/admin/bulk_product_update.js.coffee', -exclude = ['**/.#*'] + 'spec/javascripts/unit/**/*.js*' + ], -autoWatch = true; + exclude: ['**/.#*'], -browsers = ['Chrome']; + coffeePreprocessor: { + options: { + sourceMap: true + } + }, -junitReporter = { - outputFile: 'log/testacular-unit.xml', - suite: 'unit' + autoWatch: true, + + browsers: ['Chrome'], + + junitReporter: { + outputFile: 'log/testacular-unit.xml', + suite: 'unit' + } + }); };