git rid of eachLine passing the reader to the done callback (this was…

… only done for testing, but I made another workaround)
nickewing · Aug 31, 2015 · 31a61b3 · 31a61b3
1 parent 32abd5f
commit 31a61b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/line_reader.js b/lib/line_reader.js
@@ -184,13 +184,13 @@
       }
 
       if (err) {
-        if (cb) cb(err, reader);
+        if (cb) cb(err);
         return;
       }
 
       function finish(err) {
         reader.close(function(err2) {
-          if (cb) cb(err || err2, reader); 
+          if (cb) cb(err || err2); 
         });
       }
 

diff --git a/test/line_reader.js b/test/line_reader.js
@@ -261,19 +261,22 @@ describe("lineReader", function() {
     });
 
     it("should close the file when eachLine finishes", function(done) {
+      var reader;
       lineReader.eachLine(oneLineFilePath, function(line, last) {
         return false;
-      }, function(err, reader) {
+      }, function(err) {
         assert.ok(!err);
         assert.ok(reader.isClosed());
         done();
+      }).getReader(function(_reader) {
+        reader = _reader;
       });
     });
 
     it("should close the file if there is an error during eachLine", function(done) {
       var reader;
       lineReader.eachLine(testFilePath, {bufferSize: 10}, function(line, last) {
-      }, function(err, reader) {
+      }, function(err) {
         delete readErrorFds[reader.fd()];
         assert.ok(err);
         assert.ok(reader.isClosed());