From bcdf714f994441e96172a2bc74530436e24920cf Mon Sep 17 00:00:00 2001
From: Bob Evans <robert.evans25@gmail.com>
Date: Thu, 22 Jul 2021 12:52:09 -0400
Subject: [PATCH 1/2] fixes failures on adding hapi 19 and 20

---
 test/versioned/hapi/hapi-post-18/errors.tap.js | 2 +-
 test/versioned/hapi/hapi-post-18/package.json  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/versioned/hapi/hapi-post-18/errors.tap.js b/test/versioned/hapi/hapi-post-18/errors.tap.js
index c90270fac6..ec4b6d66d5 100644
--- a/test/versioned/hapi/hapi-post-18/errors.tap.js
+++ b/test/versioned/hapi/hapi-post-18/errors.tap.js
@@ -189,7 +189,7 @@ tap.test('Hapi v17 error handling', function(t) {
 
     runTest(t, (errors, statusCode) => {
       t.equals(errors.length, 0, 'has no reported errors')
-      t.equals(statusCode, 200, 'has expected 200 status')
+      t.ok([200, 204].includes(statusCode), 'has expected 200 or 204 status code')
       t.end()
     })
   })
diff --git a/test/versioned/hapi/hapi-post-18/package.json b/test/versioned/hapi/hapi-post-18/package.json
index 46abdccee7..95e7bc4e5c 100644
--- a/test/versioned/hapi/hapi-post-18/package.json
+++ b/test/versioned/hapi/hapi-post-18/package.json
@@ -9,7 +9,7 @@
       },
       "dependencies": {
         "ejs": "2.5.5",
-        "@hapi/hapi": "^18.3.1",
+        "@hapi/hapi": ">=18.3.1",
         "vision": "^5.0.0"
       },
       "files": [
@@ -27,8 +27,8 @@
     }
   ],
   "dependencies": {
-    "ejs": "^2.5.5",
     "@hapi/hapi": "^18.3.1",
+    "ejs": "^2.5.5",
     "vision": "^5.0.0"
   }
 }

From d351c1fb1b20f85398c4c49515e4f72d52c8d288 Mon Sep 17 00:00:00 2001
From: Bob Evans <robert.evans25@gmail.com>
Date: Thu, 22 Jul 2021 12:54:57 -0400
Subject: [PATCH 2/2] added stanza for hapi 20 and node 16

---
 test/versioned/hapi/hapi-post-18/package.json | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/test/versioned/hapi/hapi-post-18/package.json b/test/versioned/hapi/hapi-post-18/package.json
index 95e7bc4e5c..beb501d748 100644
--- a/test/versioned/hapi/hapi-post-18/package.json
+++ b/test/versioned/hapi/hapi-post-18/package.json
@@ -24,6 +24,28 @@
         "segments.tap.js",
         "vhost.tap.js"
       ]
+    },
+    {
+      "engines": {
+        "node": ">=16"
+      },
+      "dependencies": {
+        "ejs": "2.5.5",
+        "@hapi/hapi": "^20.1.2",
+        "vision": "^5.0.0"
+      },
+      "files": [
+        "capture-params.tap.js",
+        "errors.tap.js",
+        "ext.tap.js",
+        "hapi.tap.js",
+        "ignoring.tap.js",
+        "plugins.tap.js",
+        "render.tap.js",
+        "router.tap.js",
+        "segments.tap.js",
+        "vhost.tap.js"
+      ]
     }
   ],
   "dependencies": {