Merge branch 'release/1.5.0'

.jscs.json

@@ -95,7 +95,7 @@
         "test/data/**",
         "test/support/fakes/**"
     ],
-    "validateJSDoc": {
+    "jsDoc": {
         "checkParamNames": true,
         "requireParamTypes": true
     },

History.md

@@ -1,3 +1,6 @@
+- 1.5.0 2015-03-13
+  -npm bumps, making sure global.Promise is not defined in node 0.10 memory store test.
+
 - 1.4.1 2016-03-13
   - Fixing backward-compatibility Promise issue with node 0.10.x in memory store.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cache-manager",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Cache module for Node.js",
   "main": "index.js",
   "scripts": {
@@ -20,18 +20,18 @@
   "author": "Bryan Donovan",
   "license": "MIT",
   "dependencies": {
-    "async": "^0.9.0",
+    "async": "^1.5.2",
     "lru-cache": "4.0.0"
   },
   "devDependencies": {
     "coveralls": "^2.3.0",
     "es6-promise": "^3.0.2",
-    "istanbul": "^0.2.11",
+    "istanbul": "0.4.2",
-    "jscs": "^1.9.0",
+    "jscs": "2.11.0",
-    "jsdoc": "^3.3.0",
+    "jsdoc": "3.3.0",
-    "jshint": "^2.5.4",
+    "jshint": "2.9.1",
-    "mocha": "^1.20.1",
+    "mocha": "2.4.5",
-    "optimist": "^0.6.1",
+    "optimist": "0.6.1",
-    "sinon": "^1.10.2"
+    "sinon": "1.17.3"
   }
 }

test/stores/memory.unit.js

@@ -12,11 +12,18 @@ describe("memory store", function() {
 
     describe("set()", function() {
         var memoryCache;
+        var origPromise;
 
         beforeEach(function() {
+            origPromise = global.Promise;
+            delete global.Promise;
             memoryCache = memoryStore.create({noPromises: true});
         });
 
+        afterEach(function() {
+            global.Promise = origPromise;
+        });
+
         // This test should pass in node v0.10.x:
         it("does not require a callback or use of Promises", function(done) {
             memoryCache.set('foo', 'bar');