Merge 39ec2ae into eb02a3f

restify · Sep 4, 2020 · ae90c4f · ae90c4f
2 parents eb02a3f + 39ec2ae
commit ae90c4f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,7 @@ language: node_js
 node_js:
     - "10"                   # Maintenance LTS release
     - "12"                   # Active LTS release
-    # TODO(mmarchini): Tests are failing on v14. Need to make the package/tests
-    # compatible before re-enabling it.
-    # - "node"                 # Latest stable release
+    - "14"                   # Current
 cache:
    npm: false
 script:

diff --git a/package.json b/package.json
@@ -82,6 +82,6 @@
     "dtrace-provider": "^0.8.7"
   },
   "engines": {
-    "node": ">=10.0.0 <13.0.0"
+    "node": ">=10.0.0 <15.0.0"
   }
 }
diff --git a/test/after.test.js b/test/after.test.js
@@ -64,7 +64,6 @@ describe('`after` event', function () {
             assert.ok(req);
             assert.ok(req.socket);
             assert.ok(res);
-            assert.ok(res.socket);
             assert.equal(res.statusCode, 200);
             assert.ifError(err);
             return done();
@@ -77,7 +76,6 @@ describe('`after` event', function () {
             assert.ok(req);
             assert.ok(req.socket);
             assert.ok(res);
-            assert.ok(res.socket);
             assert.equal(res.statusCode, 500);
             assert.ok(err);
             return done();
@@ -141,7 +139,6 @@ describe('`after` event', function () {
             assert.ok(req);
             assert.ok(req.socket);
             assert.ok(res);
-            assert.ok(res.socket);
             assert.equal(res.statusCode, 200);
             assert.ifError(err);
             return done();
@@ -154,7 +151,6 @@ describe('`after` event', function () {
             assert.ok(req);
             assert.ok(req.socket);
             assert.ok(res);
-            assert.ok(res.socket);
             assert.equal(res.statusCode, 500);
             assert.ok(err);
             return done();
@@ -224,7 +220,6 @@ describe('`after` event', function () {
             assert.ok(req);
             assert.ok(req.socket);
             assert.ok(res);
-            assert.ok(res.socket);
             assert.equal(res.statusCode, 200);
             assert.ifError(err);
             return done();
@@ -243,7 +238,6 @@ describe('`after` event', function () {
             assert.ok(req);
             assert.ok(req.socket);
             assert.ok(res);
-            assert.ok(res.socket);
             assert.equal(res.statusCode, 500);
             assert.ok(err);
             return done();

diff --git a/test/errors.js b/test/errors.js
@@ -4,6 +4,7 @@
 
 var assert = require('chai').assert;
 var errors = require('restify-errors');
+const http = require('http');
 
 
 
@@ -49,7 +50,9 @@ var HTTP_CODES = [
     { name: 'UnprocessableEntityError', code: 422 },
     { name: 'LockedError', code: 423 },
     { name: 'FailedDependencyError', code: 424 },
-    { name: 'UnorderedCollectionError', code: 425 },
+    { name: http.STATUS_CODES[425] === 'Too Early'
+      ? 'TooEarlyError'
+      : 'UnorderedCollectionError', code: 425 },
     { name: 'UpgradeRequiredError', code: 426 },
     { name: 'PreconditionRequiredError', code: 428 },
     { name: 'TooManyRequestsError', code: 429 },