From 68eaa9357f4862ebd5fb516e0e854bae071a660e Mon Sep 17 00:00:00 2001 From: David Miller Date: Thu, 16 Jun 2016 15:33:28 +0100 Subject: [PATCH] Update karma config to use OPAL 0.7.x paths --- config/karma.conf.js | 69 +++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/config/karma.conf.js b/config/karma.conf.js index 71416d6..9cc3d45 100644 --- a/config/karma.conf.js +++ b/config/karma.conf.js @@ -2,7 +2,7 @@ module.exports = function(config){ var browsers, basePath, coverageReporter; var preprocessors = {} preprocessors[__dirname + '/../dischargesummary/static/js/dischargesummary/controllers/*.js'] = 'coverage'; - + if(process.env.TRAVIS){ browsers = ["Firefox"]; basePath = '/home/travis/virtualenv/python2.7/src/opal/opal/static/js'; @@ -28,39 +28,42 @@ module.exports = function(config){ files: [ //JASMINE, //JASMINE_ADAPTER, - 'angular-1.2.20/angular.js', - 'angular-1.2.20/angular-route.js', - 'angular-1.2.20/angular-resource.js', - 'angular-1.2.20/angular-cookies.js', - 'angular-1.2.20/angular-mocks.js', - 'angular-ui-utils-0.1.0/ui-utils.js', - 'angular-ui-bootstrap-0.10.0/ui-bootstrap-tpls.js', - 'angular-strap-2.3.1/angular-strap.js', - 'angular-strap-2.3.1/modules/compiler.js', - 'angular-strap-2.3.1/modules/tooltip.js', - 'angular-strap-2.3.1/modules/tooltip.tpl.js', - 'angular-strap-2.3.1/modules/dimensions.js', - 'angular-strap-2.3.1/modules/parse-options.js', - 'angular-strap-2.3.1/modules/date-parser.js', - 'angular-strap-2.3.1/modules/datepicker.js', - 'angular-strap-2.3.1/modules/datepicker.tpl.js', - 'angular-strap-2.3.1/modules/timepicker.js', - 'angular-strap-2.3.1/modules/timepicker.tpl.js', - 'angular-strap-2.3.1/modules/typeahead.js', - 'angular-strap-2.3.1/modules/typeahead.tpl.js', - "angulartics-0.17.2/angulartics.min.js", - "angulartics-0.17.2/angulartics-ga.min.js", - 'ngprogress-lite/ngprogress-lite.js', - 'jquery-1.11.3/jquery-1.11.3.js', - 'utils/underscore.js', - 'utils/showdown.js', - 'utils/moment.js', - 'bower_components/angular-growl-v2/build/angular-growl.js', - 'bower_components/ment.io/dist/mentio.js', - 'bower_components/ment.io/dist/templates.js', - 'bower_components/angular-ui-select/dist/select.js', - "bower_components/angular-local-storage/dist/angular-local-storage.js", + "lib/bower_components/angular/angular.js", + "lib/bower_components/angular-route/angular-route.js", + "lib/bower_components/angular-resource/angular-resource.js", + "lib/bower_components/angular-cookies/angular-cookies.js", + "lib/bower_components/angular-mocks/angular-mocks.js", + + 'lib/angular-ui-utils-0.1.0/ui-utils.js', + 'lib/angular-ui-bootstrap-0.10.0/ui-bootstrap-tpls.js', + 'lib/angular-strap-2.3.1/angular-strap.js', + 'lib/angular-strap-2.3.1/modules/compiler.js', + 'lib/angular-strap-2.3.1/modules/tooltip.js', + 'lib/angular-strap-2.3.1/modules/tooltip.tpl.js', + 'lib/angular-strap-2.3.1/modules/dimensions.js', + 'lib/angular-strap-2.3.1/modules/parse-options.js', + 'lib/angular-strap-2.3.1/modules/date-parser.js', + 'lib/angular-strap-2.3.1/modules/datepicker.js', + 'lib/angular-strap-2.3.1/modules/datepicker.tpl.js', + 'lib/angular-strap-2.3.1/modules/timepicker.js', + 'lib/angular-strap-2.3.1/modules/timepicker.tpl.js', + 'lib/angular-strap-2.3.1/modules/typeahead.js', + 'lib/angular-strap-2.3.1/modules/typeahead.tpl.js', + "lib/angulartics-0.17.2/angulartics.min.js", + "lib/angulartics-0.17.2/angulartics-ga.min.js", + 'lib/ngprogress-lite/ngprogress-lite.js', + 'lib/jquery-1.11.3/jquery-1.11.3.js', + 'lib/utils/underscore.js', + 'lib/utils/showdown.js', + 'lib/utils/moment.js', + 'lib/bower_components/angular-growl-v2/build/angular-growl.js', + 'lib/bower_components/ment.io/dist/mentio.js', + 'lib/bower_components/ment.io/dist/templates.js', + 'lib/bower_components/angular-ui-select/dist/select.js', + "lib/bower_components/angular-local-storage/dist/angular-local-storage.js", + + 'opal/utils.js', 'opal/opaldown.js', 'opal/directives.js',