update lodash

maxkorp · maxkorp · commit 938cc5066ba1 · 2015-02-10T17:54:04.000-07:00
diff --git a/generate/scripts/generateJson.js b/generate/scripts/generateJson.js
@@ -210,7 +210,7 @@ module.exports = function generateJson() {
     _.merge(enumerable, _.omit(override, ["values"]));
 
     output.push(enumerable);
-  });
+  }).value();
 
   output = _.sortBy(output, "typeName");
 
diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -314,7 +314,7 @@ var Helpers = {
       if (fnDef.jsFunctionName == utils.camelCase(collidingName)) {
         fnDef.jsFunctionName = utils.camelCase(newName);
       }
-    });
+    }).value();
 
     _.merge(fnDef, _.omit(fnOverrides, "args", "return"));
   },
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "istanbul": "~0.3.2",
     "js-beautify": "^1.5.4",
     "jshint": "^2.6.0",
-    "lodash": "^2.4.1",
+    "lodash": "^3.1.0",
     "mocha": "~2.1.0",
     "nan": "^1.6.2",
     "node-gyp": "~1.0.2",
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -132,7 +132,7 @@ describe("Commit", function() {
     }, function(reason) {
       return reinitialize(test)
         .then(function() {
-          return Promise.reject();
+          return Promise.reject(reason);
         });
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ var Helpers = {`
`314`	`314`	`if (fnDef.jsFunctionName == utils.camelCase(collidingName)) {`
`315`	`315`	`fnDef.jsFunctionName = utils.camelCase(newName);`
`316`	`316`	`}`
`317`		`- });`
	`317`	`+ }).value();`
`318`	`318`
`319`	`319`	`_.merge(fnDef, _.omit(fnOverrides, "args", "return"));`
`320`	`320`	`},`