Merge pull request #336 from jhnns/fix/node-args

Fix wrong order of applied arguments

Author: briancavalier

node.js

@@ -84,7 +84,7 @@ define(function(require) {
 	}
 
 	function apply2(resolver, f, thisArg, args) {
-		Promise._handler(args[0]).fold(function(y, x, resolver) {
+		Promise._handler(args[0]).fold(function(x, y, resolver) {
 			Promise._handler(x).fold(function(x, y, resolver) {
 				f.call(this, x, y, createCallback(resolver));
 			}, y, this, resolver);

test/node-test.js

@@ -69,9 +69,9 @@ buster.testCase('when/node', {
 				cb(null, x + y);
 			}
 
-			var promise = nodefn.apply(async, [10, 20]);
+			var promise = nodefn.apply(async, ['a', 'b']);
 			return promise.then(function(value) {
-				assert.equals(value, 30);
+				assert.equals(value, 'ab');
 			});
 		},
 
@@ -80,9 +80,9 @@ buster.testCase('when/node', {
 				cb(null, x + y);
 			}
 
-			var promise = nodefn.apply(async, [when(10), 20]);
+			var promise = nodefn.apply(async, [when('a'), 'b']);
 			return promise.then(function(value) {
-				assert.equals(value, 30);
+				assert.equals(value, 'ab');
 			});
 		}
 	},
@@ -139,9 +139,9 @@ buster.testCase('when/node', {
 				cb(null, x + y);
 			}
 
-			var promise = nodefn.call(async, 10, 20);
+			var promise = nodefn.call(async, 'a', 'b');
 			return promise.then(function(value) {
-				assert.equals(value, 30);
+				assert.equals(value, 'ab');
 			});
 		},
 
@@ -150,9 +150,9 @@ buster.testCase('when/node', {
 				cb(null, x + y);
 			}
 
-			var promise = nodefn.call(async, when(10), 20);
+			var promise = nodefn.call(async, when('a'), 'b');
 			return promise.then(function(value) {
-				assert.equals(value, 30);
+				assert.equals(value, 'ab');
 			});
 		}
 	},
@@ -219,26 +219,26 @@ buster.testCase('when/node', {
 		},
 
 		'should accept leading arguments': function() {
-			function fancySum(x, y, callback) {
+			function async(x, y, callback) {
 				callback(null, x + y);
 			}
 
-			var partiallyApplied = nodefn.lift(fancySum, 5);
+			var partiallyApplied = nodefn.lift(async, 'a');
 
-			return partiallyApplied(10).then(function(value) {
-				assert.equals(value, 15);
+			return partiallyApplied('b').then(function(value) {
+				assert.equals(value, 'ab');
 			}, fail);
 		},
 
 		'should accept promises as leading arguments': function() {
-			function fancySum(x, y, callback) {
+			function async(x, y, callback) {
 				callback(null, x + y);
 			}
 
-			var partiallyApplied = nodefn.lift(fancySum, when(5));
+			var partiallyApplied = nodefn.lift(async, when('a'));
 
-			return partiallyApplied(10).then(function(value) {
-				assert.equals(value, 15);
+			return partiallyApplied('b').then(function(value) {
+				assert.equals(value, 'ab');
 			});
 		}
 	},