From a62c7f5909bd28921a655978a4c1cc8c9a191ba0 Mon Sep 17 00:00:00 2001
From: Srinivasan Sekar <srinivasan.sekar1990@gmail.com>
Date: Thu, 17 Mar 2016 06:53:05 +0530
Subject: [PATCH] Lo-dash library update to improve js performance

Removed migration library

Removed migration library

updated request-promise to support to lo-dash 4.0

Reverted request promise update till we upgrade bluebird

Dont fix caps (will be done in inner drivers)

reverted other lib updates

Removed helpers as it is moved to base driver

Update dependencies and fix node version

Resolved merge conflicts

Updated lodash after merge conflicts
---
 lib/appium.js        | 6 +++---
 lib/config.js        | 2 +-
 lib/main.js          | 4 ++--
 package.json         | 2 +-
 test/config-specs.js | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/appium.js b/lib/appium.js
index eeb8760a6..330016991 100644
--- a/lib/appium.js
+++ b/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 {
diff --git a/lib/config.js b/lib/config.js
index 552ce6b57..51c3e8c44 100644
--- a/lib/config.js
+++ b/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]}`);
diff --git a/lib/main.js b/lib/main.js
index e38e68039..1cfd23466 100755
--- a/lib/main.js
+++ b/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)}`);
   }
 }
diff --git a/package.json b/package.json
index 1a4340a19..b7bdb7e17 100644
--- a/package.json
+++ b/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",
diff --git a/test/config-specs.js b/test/config-specs.js
index 25c096760..9866d642a 100644
--- a/test/config-specs.js
+++ b/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;