Merge branch 'develop'

Author: BryanDonovan

lib/server/responder.js

@@ -93,7 +93,7 @@ var responder = {
             var host = req.headers.host;
             if (is_relative_path(url)) {
                 url = url.replace(/^./, '');
-                url = host + req.path + url;
+                url = host + req.path() + url;
             } else if (url.match(/^\//)) {
                 url = host + url; // a bit hacky
             } else {

package.json

@@ -8,19 +8,19 @@
     },
     "main": "./index",
     "dependencies": {
-        "async": "0.1.22",
-        "bunyan": "0.10.0",
+        "async": "0.2.5",
+        "bunyan": "0.21.1",
         "cli-color": "0.1.6",
         "optimist" : "0.3.5",
-        "restify": "1.4.4",
+        "restify": "2.4.1",
         "settings": "0.1.0"
     },
     "devDependencies": {
         "Faker" : "0.5.6",
-        "jshint": "1.0.0",
+        "jshint": "1.1.0",
         "istanbul": "0.1.29",
-        "mocha": "1.8.1",
-        "sinon": "1.5.2"
+        "mocha": "1.9.0",
+        "sinon": "1.6.0"
     },
     "repository": {
         "type": "git",

test/server/responder.functional.js

@@ -144,8 +144,8 @@ describe("functional - server/responder.js", function () {
 
         context("when full path passed in without leading slash", function () {
             it("returns Internal error", function (done) {
-                http_client.get('/test/redirects/full_path_without_leading_slash', function (err, result, raw_res) {
-                    assert.equal(err.code, 'Internal');
+                http_client.get('/test/redirects/full_path_without_leading_slash', function (err) {
+                    assert.equal(err.body.code, 'InternalError');
                     assert.ok(err.message.match(/leading slash/));
                     done();
                 });

test/server/responder.unit.js

@@ -109,18 +109,20 @@ describe("responder.js", function () {
             });
         });
 
-        context("when request's protocol is https", function() {
-            sinon.stub(fake_res, 'header');
+        context("when request's protocol is https", function () {
+            it("redirects with https protocol", function () {
+                sinon.stub(fake_res, 'header');
 
-            var https_req = support.shallow_clone(fake_req);
-            https_req.headers['x-forwarded-proto'] = 'https';
-            var args = {url: '/foo/bar'};
+                var https_req = support.shallow_clone(fake_req);
+                https_req.headers['x-forwarded-proto'] = 'https';
+                var args = {url: '/foo/bar'};
 
-            responder.redirect(https_req, fake_res, args, fake_next);
+                responder.redirect(https_req, fake_res, args, fake_next);
 
-            assert.ok(fake_res.header.calledWith('Location', "https://local.foo.com/foo/bar"));
+                assert.ok(fake_res.header.calledWith('Location', "https://local.foo.com/foo/bar"));
 
-            fake_res.header.restore();
+                fake_res.header.restore();
+            });
         });
     });
 });

test/server/router.unit.js

@@ -48,13 +48,14 @@ describe("server/router.js", function () {
 
     describe("register_routes()", function () {
         it("adds routes to server", function () {
-            assert.strictEqual(server.routes.length, 0);
+            assert.strictEqual(Object.keys(server.routes).length, 0);
             assert.strictEqual(routes.length, 2);
 
             router.register_routes(server, routes);
 
-            assert.strictEqual(server.routes.length, 2);
-            assert.equal(server.routes[0].url, routes[0].url);
+            assert.strictEqual(Object.keys(server.routes).length, 2);
+            assert.ok(server.routes['gettestfoo']);
+            assert.ok(server.routes['gettestbar']);
         });
 
         it("throws error if routes are not an array", function () {