fix: Fix macOS + node v17 test failures

- Fix decoder test failures by importing the necessary data and running a local server, rather than relying on external sites - Tests depending on /proc are now only run on Linux - Tests that only set expectations on the behavior of the node http server (rather than needle itself) have been deleted Closes tomas#393
joeyparrish · Mar 22, 2022 · 8ea8064 · 8ea8064
1 parent 67ad8a4
commit 8ea8064
Show file tree

Hide file tree

Showing 4 changed files with 389 additions and 85 deletions.
diff --git a/test/decoder_spec.js b/test/decoder_spec.js
@@ -2,17 +2,50 @@ var should  = require('should'),
     needle  = require('./../'),
     Q       = require('q'),
     chardet = require('jschardet'),
+    fs      = require('fs'),
+    http    = require('http'),
     helpers = require('./helpers');
 
 describe('character encoding', function() {
 
-  var url;
   this.timeout(5000);
 
   describe('Given content-type: "text/html; charset=EUC-JP"', function() {
 
-    before(function() {
-      url = 'http://www.nina.jp/server/slackware/webapp/tomcat_charset.html';
+    var port = 2233;
+    var server;
+
+    function createServer() {
+      return http.createServer(function(req, res) {
+
+        req.on('data', function(chunk) {})
+
+        req.on('end', function() {
+          // We used to pull from a particular site that is no longer up.
+          // This is a local mirror pulled from archive.org
+          // https://web.archive.org/web/20181003202907/http://www.nina.jp/server/slackware/webapp/tomcat_charset.html
+          fs.readFile('test/tomcat_charset.html', function(err, data) {
+            if (err) {
+              res.writeHead(404);
+              res.end(JSON.stringify(err));
+              return;
+            }
+            res.writeHeader(200, { 'Content-Type': 'text/html; charset=EUC-JP' })
+            res.end(data);
+          });
+        })
+
+      })
+    }
+
+    before(function(done) {
+      server = createServer();
+      server.listen(port, done)
+      url = 'http://localhost:' + port;
+    })
+
+    after(function(done) {
+      server.close(done)
     })
 
     describe('with decode = false', function() {

diff --git a/test/output_spec.js b/test/output_spec.js
@@ -109,7 +109,7 @@ describe('with output option', function() {
         })
       })
 
-      if (process.platform != 'win32') {
+      if (process.platform == 'linux') {
         it('closes the file descriptor', function(done) {
           var open_descriptors = get_open_file_descriptors();
           send_request(file + Math.random(), function(err, resp) {
@@ -167,14 +167,16 @@ describe('with output option', function() {
         })
       })
 
-      it('closes the file descriptor', function(done) {
-        var open_descriptors = get_open_file_descriptors();
-        send_request(file + Math.random(), function(err, resp) {
-          var current_descriptors = get_open_file_descriptors();
-          open_descriptors.should.eql(current_descriptors);
-          done()
+      if (process.platform == 'linux') {
+        it('closes the file descriptor', function(done) {
+          var open_descriptors = get_open_file_descriptors();
+          send_request(file + Math.random(), function(err, resp) {
+            var current_descriptors = get_open_file_descriptors();
+            open_descriptors.should.eql(current_descriptors);
+            done()
+          })
         })
-      })
+      }
 
     })
 
@@ -236,7 +238,7 @@ describe('with output option', function() {
         })
       })
 
-      if (process.platform != 'win32') {
+      if (process.platform == 'linux') {
         it('closes the file descriptor', function(done) {
           var open_descriptors = get_open_file_descriptors();
           send_request(file + Math.random(), function(err, resp) {

diff --git a/test/request_stream_spec.js b/test/request_stream_spec.js
@@ -59,23 +59,6 @@ describe('request stream length', function() {
       })
     })
 
-    if (node_major_ver >= 10) {
-      it('returns 400 if Transfer-Encoding is set to a blank string', function(done) {
-        send_request({ headers: { 'Transfer-Encoding': '' }}, function(err, resp) {
-          should.not.exist(err);
-          resp.statusCode.should.eql(400);
-          done()
-        })
-      })
-    } else {
-      it('doesnt work if Transfer-Encoding is set to a blank string', function(done) {
-        send_request({ headers: { 'Transfer-Encoding': '' }}, function(err, resp) {
-          err.code.should.eql('ECONNRESET');
-          done()
-        })
-      })
-    }
-
     it('works if Transfer-Encoding is not set', function(done) {
       send_request({}, function(err, resp) {
         should.not.exist(err);
@@ -86,45 +69,6 @@ describe('request stream length', function() {
 
   })
 
-  describe('stream_length set to invalid value', function() {
-
-    if (node_major_ver >= 10) {
-
-      it('returns 400 if Transfer-Encoding is set to a blank string', function(done) {
-        send_request({ stream_length: 5, headers: { 'Transfer-Encoding': '' }}, function(err, resp) {
-          should.not.exist(err);
-          resp.statusCode.should.eql(400);
-          done()
-        })
-      })
-
-      it('returns 400 if Transfer-Encoding is not set', function(done) {
-        send_request({ stream_length: 5 }, function(err, resp) {
-          should.not.exist(err);
-          resp.statusCode.should.eql(400);
-          done()
-        })
-      })
-
-    } else {
-
-      it('doesnt work if Transfer-Encoding is set to a blank string', function(done) {
-        send_request({ stream_length: 5, headers: { 'Transfer-Encoding': '' }}, function(err, resp) {
-          err.code.should.eql('ECONNRESET');
-          done()
-        })
-      })
-      it('doesnt work if Transfer-Encoding is not set', function(done) {
-        send_request({ stream_length: 5 }, function(err, resp) {
-          err.code.should.eql('ECONNRESET');
-          done()
-        })
-      })
-
-    }
-
-  })
-
   describe('stream_length is set to valid value', function() {
 
     it('sets Content-Length header to that value', function(done) {
@@ -206,23 +150,6 @@ describe('request stream length', function() {
         })
       })
 
-      if (node_major_ver >= 10) {
-        it('returns 400 if Transfer-Encoding is set to a blank string', function(done) {
-          send_request({ stream_length: 0, headers: { 'Transfer-Encoding': '' }}, function(err, resp) {
-            should.not.exist(err);
-            resp.statusCode.should.eql(400);
-            done()
-          })
-        })
-      } else {
-        it('throws ECONNRESET if Transfer-Encoding is set to a blank string', function(done) {
-          send_request({ stream_length: 0, headers: { 'Transfer-Encoding': '' }}, function(err, resp) {
-            err.code.should.eql('ECONNRESET');
-            done()
-          })
-        })
-      }
-
       it('works if Transfer-Encoding is not set', function(done) {
         send_request({ stream_length: 0 }, function(err, resp) {
           should.not.exist(err);