Add tests for server and each series of redirect pairs

Author: davidrleonard

Diff for: app.js

@@ -37,7 +37,7 @@ var startApp = function(cb) {
     var host = server.address().address;
     var port = server.address().port;
     console.log('App listening at port %s', port);
-    cb(null,host,port);
+    cb(null,host,port,this);
   });
 }
 

Diff for: index.js

@@ -1,5 +1,5 @@
 var app = require("./app");
 
-app(function(err,host,port){
+app(function(err,host,port,server){
   console.log("We're good to go");
 });

Diff for: package.json

@@ -21,10 +21,14 @@
   },
   "homepage": "https://github.com/codeforamerica/redirect",
   "dependencies": {
+    "async": "^1.2.1",
     "consolidate": "^0.13.1",
     "ejs": "^2.3.1",
     "express": "^4.12.4",
-    "request": "^2.58.0",
     "underscore": "^1.8.3"
+  },
+  "devDependencies": {
+    "supertest": "^1.0.1",
+    "request": "^2.58.0"
   }
 }

Diff for: tests/test.js

@@ -1,19 +1,49 @@
 var assert = require("assert"),
-    request = require("request"),
+    request = require('supertest'),
+    async = require("async"),
     app = require("../app");
 
-// // Check that redirects are valid JSON
-// assert.doesNotThrow(
-//   function(){
-//     var redirects = require('../redirects.json');
-//   },
-//   "redirects.json should be valid JSON."
-// );
+// Check that redirects are valid JSON
+assert.doesNotThrow(
+  function(){
+    var redirects = require('../redirects.json');
+  },
+  "redirects.json should be valid JSON."
+);
 
-app(function(err,host,port){
-  request.get('http://localhost:3000', function (err, res, body){
-    // expect(res.statusCode).to.equal(400);
-    // expect(res.body).to.equal('wrong header');
-    console.log(res.statusCode);
-  });
-});
+// Run the server, make sure it actually works, and test all redirects
+app(function(err,host,port,server){
+  var redirects = require('../redirects.json');
+  async.parallel([
+    function(cb){
+
+      request(server)
+        .get('/')
+        .expect(200)
+        .end(function(err,res){
+          assert.doesNotThrow(
+            function(){ if (err) throw err; },
+            "The root address should return 200 when accessed over http"
+          );
+          cb();
+        });
+
+    },
+    function(cb){
+
+      async.forEachOfSeries(redirects, function(val,key,cb){
+        request(server)
+          .get('/'+key)
+          .expect(301)
+          .end(function(err,res){
+            assert.doesNotThrow(
+              function(){ if (err) throw err; },
+              "Each redirect pair should return a 301"
+            );
+            cb();
+          });
+      },function(err,res){ cb(); });
+
+    }
+  ],function(err,res){ server.close(); });
+});