Merge pull request #1094 from bspates/bind-after-ensure-async

Bind Context to Functions wrapped by initialParams

2 files changed, 33 insertions, 1 deletions

diff --git a/lib/internal/initialParams.js b/lib/internal/initialParams.js
index 635caba..55c4e12 100644
--- a/lib/internal/initialParams.js
+++ b/lib/internal/initialParams.js
@@ -3,6 +3,6 @@ import rest from 'lodash/rest';
 export default function (fn) {
     return rest(function (args/*..., callback*/) {
         var callback = args.pop();
-        fn(args, callback);
+        fn.call(this, args, callback);
     });
 }
diff --git a/mocha_test/ensureAsync.js b/mocha_test/ensureAsync.js
new file mode 100644
index 0000000..c33e344
--- /dev/null
+++ b/mocha_test/ensureAsync.js
@@ -0,0 +1,32 @@
+var async = require('../lib');

+var expect = require('chai').expect;

+

+describe('ensureAsync', function() {

+    var passContext = function(cb) {

+        cb(this);

+    };

+

+    it('should propely bind context to the wrapped function', function(done) {

+

+        // call bind after wrapping with ensureAsync

+        var context = {context: "post"};

+        var postBind = async.ensureAsync(passContext);

+        postBind = postBind.bind(context);

+        postBind(function(ref) {

+            expect(ref).to.equal(context);

+            done();

+        });

+    });

+

+    it('should not override the bound context of a function when wrapping', function(done) {

+

+        // call bind before wrapping with ensureAsync

+        var context = {context: "pre"};

+        var preBind = passContext.bind(context);

+        preBind = async.ensureAsync(preBind);

+        preBind(function(ref) {

+            expect(ref).to.equal(context);

+            done();

+        });

+    });

+});