migrate to restify 2.4.1

Author: killmenot

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

@@ -12,7 +12,7 @@
         "bunyan": "0.10.0",
         "cli-color": "0.1.6",
         "optimist" : "0.3.5",
-        "restify": "1.4.4",
+        "restify": "2.4.1",
         "settings": "0.1.0"
     },
     "devDependencies": {

test/server/responder.functional.js

@@ -145,7 +145,7 @@ 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');
+                    assert.equal(err.body.code, 'InternalError');
                     assert.ok(err.message.match(/leading slash/));
                     done();
                 });

test/server/router.unit.js

@@ -1,6 +1,6 @@
-/*jshint unused:false*/
 var assert = require('assert');
 var restify = require('restify');
+var sinon = require('sinon');
 var support = require('../support');
 var router = main.server.router;
 var TEST_HOST = support.http.host;
@@ -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 () {