From a098d4e1ccead6619196f79b5586cf846678373f Mon Sep 17 00:00:00 2001
From: Bryce Kahle <bkahle@gmail.com>
Date: Sun, 2 Aug 2020 15:10:12 -0400
Subject: [PATCH] Fix node tests

finalhandler returns a request body that we do not expect. Use a simple 404 instead.
---
 package.json                   | 1 -
 tests/support/sockjs_server.js | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 5f82cc56..cfb3ecd7 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
     "envify": "^4.0.0",
     "eslint": "^7.6.0",
     "expect.js": "~0.3.1",
-    "finalhandler": "^1.1.2",
     "gulp": "^4.0.2",
     "gulp-header": "^2.0.9",
     "gulp-rename": "^2.0.0",
diff --git a/tests/support/sockjs_server.js b/tests/support/sockjs_server.js
index 115894f0..5a6f688c 100644
--- a/tests/support/sockjs_server.js
+++ b/tests/support/sockjs_server.js
@@ -3,7 +3,6 @@
 
 var http = require('http');
 var serveStatic = require('serve-static');
-var finalhandler = require('finalhandler');
 var sockjs = require('./sockjs_app');
 var url = require('url');
 var path = require('path');
@@ -19,7 +18,7 @@ function startServer(port, config, prefix) {
     }
   };
 
-  var serve = serveStatic(path.join(__dirname, '../html'));
+  var serve = serveStatic(path.join(__dirname, '../html'), { fallthrough: false });
 
   var server = http.createServer();
   server.addListener('request', function(req, res) {
@@ -53,7 +52,10 @@ function startServer(port, config, prefix) {
       res.end('var clientOptions = ' +
               JSON.stringify(clientOptions) + ';');
     } else {
-      serve(req, res, finalhandler(req, res));
+      serve(req, res, function(err) {
+        var status = err ? err.statusCode : 404;
+        return res.writeHead(status).end();
+      });
     }
   });
   server.addListener('upgrade', function(req, res){