The test itself starts the server in a before hook

2014-12-13 13:56:21 +01:00
parent 3ad6cdef51
commit 8abfe93df7
4 changed files with 24 additions and 23 deletions
@@ -20,13 +20,14 @@ var uiController            = require('../lib/server/controllers/uiController')(


 // Let's start the server!
-if (!process.env.GRUNTED) {
-    // The server is not launched by Grunt
-    var settings = require('../server_config/settings.json');
-    server.listen(settings.serverPort, function() {
-        console.log('Listening on port %d', server.address().port);
-    });
-}
+var settings = require('../server_config/settings.json');
+server.listen(settings.serverPort, function() {
+    console.log('Listening on port %d', server.address().port);

-// For Grunt
-module.exports = app;
+    // For the tests
+    if (server.startTests) {
+        server.startTests();
+    }
+});
+
+module.exports = server;