Merge pull request #6296 from SrinivasanTarget/master

Lo-dash library update to improve js performance

lib/appium.js

@@ -25,7 +25,7 @@ class AppiumDriver extends BaseDriver {
   }
 
   sessionExists (sessionId) {
-    return _.contains(_.keys(this.sessions), sessionId) &&
+    return _.includes(_.keys(this.sessions), sessionId) &&
            this.sessions[sessionId].sessionId !== null;
   }
 
@@ -80,7 +80,7 @@ class AppiumDriver extends BaseDriver {
 
   async getSessions () {
     let sessions = [];
-    for (let [id, driver] of _.pairs(this.sessions)) {
+    for (let [id, driver] of _.toPairs(this.sessions)) {
       sessions.push({id: id, capabilities: driver.caps});
     }
     return sessions;
@@ -93,7 +93,7 @@ class AppiumDriver extends BaseDriver {
     log.info(`Creating new ${InnerDriver.name} session`);
     log.info('Capabilities:');
     util.inspect(caps);
-    for (let [cap, value] of _.pairs(caps)) {
+    for (let [cap, value] of _.toPairs(caps)) {
       log.info(`  ${cap}: ${util.inspect(value)}`);
     }
     try {

lib/config.js

@@ -126,7 +126,7 @@ function validateServerArgs (parser, args) {
 
   const nonDefaultArgs = getNonDefaultArgs(parser, args);
 
-  for (let [arg, validator] of _.pairs(validations)) {
+  for (let [arg, validator] of _.toPairs(validations)) {
     if (_.has(nonDefaultArgs, arg)) {
       if (!validator(args[arg], arg)) {
         throw new Error(`Invalid argument for param ${arg}: ${args[arg]}`);

lib/main.js

@@ -38,14 +38,14 @@ async function preflightChecks (parser, args) {
 
 function logDeprecationWarning (deprecatedArgs) {
   logger.warn('Deprecated server args:');
-  for (let [arg, realArg] of _.pairs(deprecatedArgs)) {
+  for (let [arg, realArg] of _.toPairs(deprecatedArgs)) {
     logger.warn(`  ${arg.red} => ${realArg}`);
   }
 }
 
 function logNonDefaultArgsWarning (args) {
   logger.info('Non-default server args:');
-  for (let [arg, value] of _.pairs(args)) {
+  for (let [arg, value] of _.toPairs(args)) {
     logger.info(`  ${arg}: ${util.inspect(value)}`);
   }
 }

package.json

@@ -49,7 +49,7 @@
     "babel-runtime": "=5.8.24",
     "bluebird": "^2.10.2",
     "date-utils": "^1.2.19",
-    "lodash": "^3.10.1",
+    "lodash": "^4.6.1",
     "mobile-json-wire-protocol": "^1.3.3",
     "npmlog": "^2.0.3",
     "request-promise": "^1.0.2",

test/config-specs.js

@@ -55,7 +55,7 @@ describe('Config', () => {
       // but also to have access to process methods
       // so copy them over to a writable object
       let tempProcess = {};
-      for (let [prop, value] of _.pairs(process)) {
+      for (let [prop, value] of _.toPairs(process)) {
         tempProcess[prop] = value;
       }
       process = tempProcess;