Update tests to be less weird and report more accurate coverage

index.js

@@ -37,20 +37,23 @@ var auth = function (req, res, next) {
   };
 };
 
-// ensure log directory exists
-fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
+/*istanbul ignore if*/
+if (production === "-p") {
+  // ensure log directory exists
+  fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
 
-// create a rotating write stream
-var accessLogStream = FileStreamRotator.getStream({
-  date_format: 'YYYYMMDD',
-  filename: logDirectory + '/access-%DATE%.log',
-  frequency: 'daily',
-  verbose: false
-})
+  // create a rotating write stream
+  var accessLogStream = FileStreamRotator.getStream({
+    date_format: 'YYYYMMDD',
+    filename: logDirectory + '/access-%DATE%.log',
+    frequency: 'daily',
+    verbose: false
+  })
 
-// setup the logger
-app.use(morgan('short', {stream: accessLogStream}))
-app.use(morgan('short'));
+  // setup the logger
+  app.use(morgan('short', {stream: accessLogStream}))
+  app.use(morgan('short'));
+}
 
 app.use(function(req, res, next) {
   res.header("Access-Control-Allow-Origin", "*");
@@ -68,7 +71,7 @@ if (production === "-p") {
   app.use('/log', auth, serveIndex('log', {'icons': true}));
 }
 
-app.listen(3000, function () {
+var server = app.listen(3000, function () {
   console.log('Now accepting connections on port 3000.');
 });
 
@@ -92,4 +95,10 @@ if (production === "-p") {
 process.on('SIGINT', function() {
   console.log( "\nRecieved Ctrl-C, shutting down." );
   process.exit(0);
-})
+});
+
+module.exports = {
+  close: function () {
+    server.close();
+  }
+};

package.json

@@ -4,9 +4,7 @@
   "description": "Server for the IP project",
   "main": "index.js",
   "scripts": {
-    "pretest": "istanbul cover index.js > debug.log &",
-    "test": "sleep 2; node jasmine-runner.js; node utils/flushdb.js",
-    "posttest": "killall -2 node"
+    "test": "istanbul cover jasmine-runner.js && node utils/flushdb.js"
   },
   "repository": {
     "type": "git",

spec/friends-ops-spec.js

@@ -1,5 +1,6 @@
 var request = require("request");
 var base_url = "http://localhost:3000";
+var server = require("../index.js");
 
 describe("Friends Operations", function () {
 
@@ -137,6 +138,7 @@ describe("Friends Operations", function () {
         expect(response.statusCode).toBe(200);
         expect(body.success).toBe(0);
         expect(body.error).toBe(3);
+        server.close();
         done();
       });
     });

spec/misc-ops-spec.js

@@ -1,5 +1,6 @@
 var request = require("request");
 var base_url = "http://localhost:3000";
+var server = require("../index.js");
 
 describe("Misc Operations", function () {
   describe("GET /hello/:name", function () {

spec/user-ops-spec.js

@@ -32,9 +32,7 @@ describe("User Operations", function () {
       request(register_user("foo123"), function (error, response, body) {
         expect(response.statusCode).toBe(200);
         expect(body.registered).toBe(1);
-        if (body["auth-key"]) {
-          expect(body["auth-key"].length).toBe(60);
-        }
+        expect(body["auth-key"].length).toBe(60);
         expect(body.error).toBe(0);
         done();
       });