fix

Author: ivailop

lib/server/app_server.js

@@ -9,6 +9,10 @@ var log_path = path.resolve(__dirname, '..', '..', 'log', ENV + '.log');
 var logger = bunyan.createLogger({
     name: 'app',
     streams: [
+        {
+            level: 'debug',
+            stream: process.stdout
+        },
         {
             path: log_path,
             level: 'debug'
@@ -48,7 +52,7 @@ AppServer.prototype.start = function (options) {
 
     self.server.listen(parseInt(port, 10));
 
-    self.server.use(restify.plugins.bodyParser());
+    self.server.use(restify.plugins.bodyParser({mapParams: true}));
     self.server.use(restify.plugins.queryParser());
 
     self.started = true;

lib/server/responder.js

@@ -128,7 +128,7 @@ var responder = {
             res.setHeader('Content-Length', args.contentLength);
         }
 
-        res.status(200);
+        res.writeHead(200);
         args.stream.pipe(res);
         next();
     }

test/server/responder.functional.js

@@ -202,14 +202,17 @@ describe("functional - server/responder.js", function () {
         });
 
         after(function () {
-            fs.unlinkSync(filename);
+            if (fs.existsSync(filename)) {
+                fs.unlinkSync(filename);
+            }
         });
 
         it("returns correct headers and content", function (done) {
             http_raw_client.get('/test/downloads/content', function (err, data, res, req) {
                 assert.ifError(err);
 
                 req.on('result', function (err, res) {
+                    console.log(err);
                     assert.ifError(err);
 
                     var expected_file_size = fs.statSync(file_to_download).size;

test/server/responder.unit.js

@@ -9,7 +9,8 @@ var fake_res = {
     status: function () {},
     json: function () {},
     send: function () {},
-    setHeader: function () {}
+    setHeader: function () {},
+    writeHead: function () {}
 };
 
 var fake_req = {
@@ -191,6 +192,7 @@ describe("responder.js", function () {
         context("when args.contentType not passed in", function () {
             it("responds with Content-Type header set to application/octet-stream", function (done) {
                 sinon.spy(fake_res, 'setHeader');
+                sinon.spy(fake_res, 'writeHead');
                 sinon.stub(args.stream, 'pipe').callsFake(function () { });
 
                 delete args.contentType;
@@ -199,6 +201,7 @@ describe("responder.js", function () {
                 assert.ok(fake_res.setHeader.calledWith('Content-Type', 'application/octet-stream'));
 
                 fake_res.setHeader.restore();
+                fake_res.writeHead.restore();
                 args.stream.pipe.restore();
                 done();
             });
@@ -207,6 +210,7 @@ describe("responder.js", function () {
         context("when args.contentLength not passed in", function () {
             it("responds without Content-Length header set", function (done) {
                 sinon.spy(fake_res, 'setHeader');
+                sinon.spy(fake_res, 'writeHead');
                 sinon.stub(args.stream, 'pipe').callsFake(function () { });
 
                 delete args.contentLength;
@@ -215,26 +219,28 @@ describe("responder.js", function () {
                 assert.ok(!fake_res.setHeader.calledWith('Content-Length'));
 
                 fake_res.setHeader.restore();
+                fake_res.writeHead.restore();
                 args.stream.pipe.restore();
                 done();
             });
         });
 
         context("when args passed in correctly", function () {
-            it("responds without 200 status and content", function (done) {
+            it("responds with 200 status and content", function (done) {
                 sinon.spy(fake_res, 'setHeader');
-                sinon.spy(fake_res, 'status');
+                sinon.spy(fake_res, 'writeHead');
                 sinon.stub(args.stream, 'pipe').callsFake(function () { });
 
                 responder.download(fake_res, args, fake_next);
 
                 assert.ok(fake_res.setHeader.calledWith('Content-Type', 'application/javascript'));
                 assert.ok(fake_res.setHeader.calledWith('Content-Length', 2000));
                 assert.ok(fake_res.setHeader.calledWith('Content-Disposition', 'attachment; filename=foo.js'));
-                assert.ok(fake_res.status.calledWith(200));
+                assert.ok(fake_res.writeHead.calledWith(200));
                 assert.ok(args.stream.pipe.calledWith(fake_res));
 
                 fake_res.setHeader.restore();
+                fake_res.writeHead.restore();
                 args.stream.pipe.restore();
                 done();
             });

test/server/router.unit.js

@@ -48,7 +48,7 @@ describe("server/router.js", function () {
 
     describe("register_routes()", function () {
         it("adds routes to server", function () {
-            assert.ok(Object.keys(server.router.getRoutes()).length === 0);
+            assert.strictEqual(Object.keys(server.router.getRoutes()).length, 0);
             assert.strictEqual(routes.length, 2);
 
             router.register_routes(server, routes);

test/support/http.js

@@ -1,4 +1,5 @@
 var restify = require('restify');
+var bunyan = require('bunyan');
 var clients = require('restify-clients');
 var host = process.env.HOST || 'localhost';
 var port = process.env.PORT;
@@ -12,10 +13,23 @@ if (!port) {
 }
 
 function TestServer(args) {
+    var logger = bunyan.createLogger({
+        name: 'app',
+        streams: [
+            {
+                level: 'trace',
+                stream: process.stdout
+            }
+        ]
+    });
     this.routes = args.routes;
-    this.server = restify.createServer();
-    this.server.use(restify.plugins.bodyParser());
+    this.server = restify.createServer({ log: logger });
+    this.server.use(restify.plugins.bodyParser({mapParams: true}));
     this.server.use(restify.plugins.queryParser());
+    this.server.on('after', restify.plugins.auditLogger({
+        log: logger,
+        event: 'after'
+    }));
     main.server.router.register_routes(this.server, this.routes);
 }