Merge branch 'hotfix/4.0.28'

build/collect.js

@@ -2703,10 +2703,12 @@ module.exports = function values() {
 
 module.exports = function when(value, fn, defaultFn) {
   if (value) {
-    fn(this);
-  } else {
-    defaultFn(this);
+    return fn(this, value);
+  } else if (defaultFn) {
+    return defaultFn(this, value);
   }
+
+  return this;
 };
 
 /***/ }),

dist/methods/when.js

@@ -2,8 +2,10 @@
 
 module.exports = function when(value, fn, defaultFn) {
   if (value) {
-    fn(this);
-  } else {
-    defaultFn(this);
+    return fn(this, value);
+  } else if (defaultFn) {
+    return defaultFn(this, value);
   }
+
+  return this;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "collect.js",
-  "version": "4.0.27",
+  "version": "4.0.28",
   "description": "Convenient and dependency free wrapper for working with arrays and objects.",
   "main": "dist/index.js",
   "typings": "index.d.ts",

src/methods/when.js

@@ -2,8 +2,10 @@
 
 module.exports = function when(value, fn, defaultFn) {
   if (value) {
-    fn(this);
-  } else {
-    defaultFn(this);
+    return fn(this, value);
+  } else if (defaultFn) {
+    return defaultFn(this, value);
   }
+
+  return this;
 };

test/methods/when_test.js

@@ -18,4 +18,35 @@ module.exports = (it, expect, collect) => {
 
     expect(collection.all()).to.eql([1, 2, 3, 4, 6]);
   });
+
+  it('should pass the value over to the callback', () => {
+    let collection = collect(['michael', 'tom']);
+
+    collection.when('adam', (innerCollection, newName) => innerCollection.push(newName));
+
+    expect(collection.all()).to.eql(['michael', 'tom', 'adam']);
+
+    collection = collect(['michael', 'tom']);
+
+    collection.when(false, (innerCollection, newName) => innerCollection.push(newName));
+
+    expect(collection.all()).to.eql(['michael', 'tom']);
+  });
+
+  it('should call the default callback if the value is false', () => {
+    const collection = collect(['michael', 'tom']);
+
+    collection.when(false, innerCollection => innerCollection.push('adam'), innerCollection => innerCollection.push('taylor'));
+
+    expect(collection.all()).to.eql(['michael', 'tom', 'taylor']);
+  });
+
+  it('should return the collection object', () => {
+    const collection = collect(['michael', 'tom']);
+
+    const newCollection = collection.when('adam', innerCollection => innerCollection.push('adam'));
+
+    expect(newCollection).to.eql(collection);
+    expect(collection.all()).to.eql(['michael', 'tom', 'adam']);
+  });
 };