fix: server should fire not acceptable event (#1627)

restify · Mar 20, 2018 · 8b11b71 · 8b11b71
1 parent 7132fda
commit 8b11b71
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/lib/plugins/accept.js b/lib/plugins/accept.js
@@ -48,12 +48,9 @@ function acceptParser(accepts) {
 
     function parseAccept(req, res, next) {
         if (req.accepts(acceptable)) {
-            next();
-            return;
+            return next();
         }
-
-        res.json(e);
-        next(false);
+        return next(e);
     }
 
     return parseAccept;

diff --git a/test/plugins/accept.test.js b/test/plugins/accept.test.js
@@ -68,4 +68,27 @@ describe('accept parser', function() {
             done();
         });
     });
+
+    it('GH-1619: should fire NotAcceptable event on server', function(done) {
+        var opts = {
+            path: '/',
+            headers: {
+                accept: 'foo/bar'
+            }
+        };
+        var evtFired = false;
+
+        SERVER.on('NotAcceptable', function(req, res, err, cb) {
+            evtFired = true;
+            return cb();
+        });
+
+        CLIENT.get(opts, function(err, _, res) {
+            assert.ok(err);
+            assert.equal(err.name, 'NotAcceptableError');
+            assert.equal(res.statusCode, 406);
+            assert.isTrue(evtFired);
+            return done();
+        });
+    });
 });