Added tests for .pooled

NatalieWolfe · Jul 9, 2015 · 818adc3 · 818adc3
1 parent 740d05c
commit 818adc3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/lib/PromisePool.js b/lib/PromisePool.js
@@ -538,9 +538,10 @@ PromisePool.prototype.pooled = function(decorated, priority){
     var slice = Array.prototype.slice;
     return function(){
         var args = slice.call(arguments);
+        var wrappedSelf = this;
         return self.acquire(function(client){
-            args.shift(client);
-            return decorated.apply(null, args);
+            args.unshift(client);
+            return decorated.apply(wrappedSelf, args);
         }, priority);
     };
 };

diff --git a/tests/unit/pool.js b/tests/unit/pool.js
@@ -203,8 +203,40 @@ describe('PromisePool', function(){
     });
 
     describe('#pooled', function(){
-        it('should wrap the function with an acquisition');
-        it('should call the wrapped function in the wrapper\'s context');
+        it('should wrap the function with an acquisition', function(){
+            var conn = null;
+            var func = pool.pooled(function(_conn, foo, bar){
+                conn = _conn;
+                foo.should.eql('foo');
+                bar.should.eql('bar');
+                return Promise.resolve('foobar');
+            });
+
+            func.should.be.a.function;
+            should.not.exist(conn);
+
+            return func('foo', 'bar').then(function(res){
+                res.should.eql('foobar');
+                should.exist(conn);
+            });
+        });
+
+        it('should call the wrapped function in the wrapper\'s context', function(){
+            var conn = null;
+            var obj = {
+                thisIsIt: true,
+                func: pool.pooled(function(_conn){
+                    conn = _conn;
+                    should.exist(this);
+                    this.thisIsIt.should.be.true;
+                    return Promise.resolve();
+                })
+            };
+
+            return obj.func('foo', 'bar').then(function(){
+                should.exist(conn);
+            });
+        });
     });
 
     describe('#length', function(){