From 72d331102af816e9086fc16115c67016556efa42 Mon Sep 17 00:00:00 2001 From: Matt Styles Date: Sat, 11 May 2013 21:24:29 +0100 Subject: [PATCH] Use Phantom as standard for tests --- karma-e2e.conf.js | 3 ++- karma.conf.js | 3 ++- server/server.js | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/karma-e2e.conf.js b/karma-e2e.conf.js index 8b92018..fe774e1 100644 --- a/karma-e2e.conf.js +++ b/karma-e2e.conf.js @@ -41,7 +41,8 @@ autoWatch = false; // - Safari (only Mac) // - PhantomJS // - IE (only Windows) -browsers = ['Chrome']; +//browsers = ['Chrome', 'Firefox','Safari']; +browsers = ['PhantomJS']; // If browser does not capture in given timeout [ms], kill it captureTimeout = 5000; diff --git a/karma.conf.js b/karma.conf.js index ce66878..90aed08 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -47,7 +47,8 @@ autoWatch = false; // - Safari (only Mac) // - PhantomJS // - IE (only Windows) -browsers = ['Chrome']; +//browsers = ['Chrome', 'Firefox', 'Safari']; +browsers = ['PhantomJS']; // If browser does not capture in given timeout [ms], kill it captureTimeout = 5000; diff --git a/server/server.js b/server/server.js index ab4fc78..d3a72b7 100644 --- a/server/server.js +++ b/server/server.js @@ -15,7 +15,6 @@ var server = module.exports = express(); // Configure Server server.configure( function() { server.set( 'port', process.env.PORT || appConfig.server.port ); - // @todo add hogan to serve views server.set( 'views', path.join( __dirname, './../app' ) ); server.engine( 'html', cons.hogan ); server.set( 'view engine', 'html' );