Don't brake store context for isCacheableValue method

jaredwray · Mar 10, 2018 · d0da236 · d0da236
1 parent 2d9dece
commit d0da236
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/caching.js b/lib/caching.js
@@ -38,7 +38,7 @@ var caching = function(args) {
     if (typeof args.isCacheableValue === 'function') {
         self._isCacheableValue = args.isCacheableValue;
     } else if (typeof self.store.isCacheableValue === 'function') {
-        self._isCacheableValue = self.store.isCacheableValue;
+        self._isCacheableValue = self.store.isCacheableValue.bind(self.store);
     } else {
         self._isCacheableValue = function(value) {
             return value !== undefined;

diff --git a/test/caching.unit.js b/test/caching.unit.js
@@ -1234,4 +1234,22 @@ describe("caching", function() {
             });
         });
     });
+
+    describe("when using store's isCacheableValue method", function() {
+        it("should not break its' context", function() {
+            var store = {
+                isCacheableValue: function() {
+                    if (this !== store) {
+                        throw new Error("Broken store context");
+                    }
+                },
+                get: function() {},
+                set: function() {},
+            };
+
+            cache = caching({store: store});
+
+            assert.doesNotThrow(cache._isCacheableValue);
+        });
+    });
 });