Merge pull request koajs#3 from koajs/yield-delegate

yield*
fl0w · Nov 10, 2013 · 767da19 · 767da19
2 parents d022039 + 516b12c
commit 767da19
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -29,7 +29,7 @@ function compose(middleware){
       if (!mw) {
         if (done) throw new Error('middleware yielded control multiple times');
         done = true;
-        return downstream || noop;
+        return downstream || noop();
       }
 
       return mw.call(ctx, next());
@@ -43,6 +43,4 @@ function compose(middleware){
  * @api private
  */
 
-function noop(done){
-  done();
-}
+function *noop(){}
diff --git a/test.js b/test.js
@@ -89,6 +89,16 @@ describe('Koa Compose', function(){
     co(compose(stack))(done);
   })
 
+  it('should work when yielding at the end of the stack with yield*', function(done) {
+    var stack = [];
+
+    stack.push(function *(next){
+      yield* next;
+    });
+
+    co(compose(stack))(done);
+  })
+
   it('should keep the context', function(done){
     var ctx = {};