Fix broken karma config import and adjust default browsers - An angular-scenario import was causing all tests to fail if it is left uncommented. - Add Chrome browser option and plugin to config but keep PhantomJS as the default.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/819acb7d Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/819acb7d Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/819acb7d Branch: refs/heads/master Commit: 819acb7d6f002a0bda228ac21542dcdd34b32782 Parents: c169157 Author: Michael Joyce <[email protected]> Authored: Fri Aug 1 14:00:35 2014 -0700 Committer: Michael Joyce <[email protected]> Committed: Mon Aug 4 15:01:02 2014 -0700 ---------------------------------------------------------------------- ocw-ui/frontend-new/test/karma.conf.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/819acb7d/ocw-ui/frontend-new/test/karma.conf.js ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend-new/test/karma.conf.js b/ocw-ui/frontend-new/test/karma.conf.js index a552aa6..744d927 100644 --- a/ocw-ui/frontend-new/test/karma.conf.js +++ b/ocw-ui/frontend-new/test/karma.conf.js @@ -26,7 +26,9 @@ module.exports = function(config) { 'bower_components/angular-route/angular-route.js', 'bower_components/angular-animate/angular-animate.js', 'bower_components/angular-bootstrap/ui-bootstrap.js', - 'bower_components/angular-scenario/angular-scenario.js', + // For some reason this causes the tests to completely fail to run + // if it is uncommented. + //'bower_components/angular-scenario/angular-scenario.js', 'bower_components/angular-ui-date/src/date.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', 'bower_components/chap-links-timeline/timeline.js', @@ -53,12 +55,14 @@ module.exports = function(config) { // - PhantomJS // - IE (only Windows) browsers: [ - 'PhantomJS' + 'PhantomJS', + //'Chrome' ], // Which plugins to enable plugins: [ 'karma-phantomjs-launcher', + 'karma-chrome-launcher', 'karma-jasmine' ],
