Merge pull request #15 from dmihal/patch-1

Don't pass the callback to the handler

publication-collector.js

@@ -27,9 +27,6 @@ PublicationCollector = class PublicationCollector extends EventEmitter {
   }
 
   collect(name, ...args) {
-    const handler = Meteor.server.publish_handlers[name];
-    const result = handler.call(this, ...args);
-
     if (_.isFunction(args[args.length - 1])) {
       const callback = args.pop();
       this.on('ready', collections => {
@@ -38,6 +35,9 @@ PublicationCollector = class PublicationCollector extends EventEmitter {
       });
     }
 
+    const handler = Meteor.server.publish_handlers[name];
+    const result = handler.call(this, ...args);
+
     // TODO -- we should check that result has _publishCursor? What does _runHandler do?
     if (result) {
       // array-ize

tests/publication-collector.test.js

@@ -109,6 +109,18 @@ describe('PublicationCollector', () => {
 
       collector.collect('publicationWithArgs', 'foo', 'bar');
     });
+
+    it('should support optional publication arguments', (done) => {
+      Meteor.publish('publicationWithOptionalArg', function(arg1 = 'foo') {
+        assert.equal(arg1, 'foo');
+        this.ready();
+        done();
+      });
+
+      const collector = new PublicationCollector();
+
+      collector.collect('publicationWithOptionalArg', function(){});
+    });
   });
 
   describe('Added', () => {