Merge pull request #227 from pelias/fix-stream-end

fix(lookupStream): properly use lookupStream end event

src/lookupStream.js

@@ -104,7 +104,7 @@ module.exports = function(pipResolver, maxConcurrentReqs) {
   const end = createPipResolverEnd(pipResolver);
 
   const stream = parallelTransform(maxConcurrentReqs || 1, pipResolverStream);
-  stream.on('finish', end);
+  stream.on('end', end);
 
   return stream;
 };

test/lookupStreamTest.js

@@ -255,16 +255,31 @@ tape('tests', (test) => {
   });
 
   test.test('call end to stop child processes', (t) => {
+    // create a stubbed resolver that implements all required methods
     const resolver = {
+      lookup: (centroid, search_layers, callback) => {
+        setTimeout(callback, 0, null, []);
+      },
       end: function () {
         t.assert(true, 'called end function');
         t.equals(resolver, this, 'this is set to the correct object');
         t.end();
       }
     };
+    // create one document to pass through the stream
+    const inputDoc = new Document( 'whosonfirst', 'placetype', '1')
+      .setCentroid({ lat: 12.121212, lon: 21.212121 });
 
-    stream(resolver).end();
+    // create the stream to test
+    const tested_stream = stream(resolver);
 
-  });
+    // consume the stream so that all data is processed
+    tested_stream.on('data', function() {});
+
+    // write document to stream
+    tested_stream.write(inputDoc, null, function() {});
 
+    // call end to trigger cleanup
+    tested_stream.end();
+  });
 });