From 9ad3c7b0a75d17db7794b6f9900c68a1876a8399 Mon Sep 17 00:00:00 2001
From: Vitaly Kramskikh <vkramskikh@mirantis.com>
Date: Wed, 10 Aug 2016 13:42:35 +0300
Subject: [PATCH] Fix UI functional tests in Firefox 47+

Firefox since version 47 requires use of Marionette driver
to work with Selenium. Updated selenium-standalone downloads
and utilizes this driver by default.

Change-Id: I9659cee48491f4de9484c23fb9a4f59f69797d29
---
 gulpfile.js         |   4 +-
 npm-shrinkwrap.json | 196 ++++++++++++++++++++++++++------------------
 package.json        |   2 +-
 3 files changed, 120 insertions(+), 82 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index f12de2d02..98e4ddade 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -55,8 +55,8 @@ function shutdownSelenium() {
   }
 }
 
-var SELENIUM_VERSION = '2.52.0';
-var SELENIUM_DRIVERS = {chrome: {version: '2.20'}};
+var SELENIUM_VERSION = '2.53.1';
+var SELENIUM_DRIVERS = {};
 
 gulp.task('selenium:fetch', function(cb) {
   var selenium = require('selenium-standalone');
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 221a07406..4dbc5733f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2817,79 +2817,17 @@
       "version": "1.1.2"
     },
     "selenium-standalone": {
-      "version": "4.4.3",
+      "version": "5.5.0",
       "dependencies": {
-        "asn1": {
-          "version": "0.1.11"
-        },
-        "assert-plus": {
-          "version": "0.1.5"
+        "progress": {
+          "version": "1.1.8"
         },
         "async": {
           "version": "1.2.1"
         },
-        "aws-sign2": {
-          "version": "0.5.0"
-        },
-        "bl": {
-          "version": "0.9.5"
-        },
-        "boom": {
-          "version": "0.4.2"
-        },
-        "caseless": {
-          "version": "0.8.0"
-        },
-        "combined-stream": {
-          "version": "0.0.7"
-        },
         "commander": {
           "version": "2.6.0"
         },
-        "cryptiles": {
-          "version": "0.2.2"
-        },
-        "ctype": {
-          "version": "0.5.3"
-        },
-        "delayed-stream": {
-          "version": "0.0.5"
-        },
-        "forever-agent": {
-          "version": "0.5.2"
-        },
-        "form-data": {
-          "version": "0.2.0",
-          "dependencies": {
-            "async": {
-              "version": "0.9.2"
-            },
-            "mime-types": {
-              "version": "2.0.14"
-            }
-          }
-        },
-        "hawk": {
-          "version": "1.1.1"
-        },
-        "hoek": {
-          "version": "0.9.1"
-        },
-        "http-signature": {
-          "version": "0.10.1"
-        },
-        "is-absolute": {
-          "version": "0.1.7"
-        },
-        "is-relative": {
-          "version": "0.1.3"
-        },
-        "mime-db": {
-          "version": "1.12.0"
-        },
-        "mime-types": {
-          "version": "1.0.2"
-        },
         "minimist": {
           "version": "1.1.0"
         },
@@ -2901,23 +2839,123 @@
             }
           }
         },
-        "oauth-sign": {
-          "version": "0.5.0"
-        },
-        "qs": {
-          "version": "2.3.3"
-        },
-        "readable-stream": {
-          "version": "1.0.34"
-        },
         "request": {
-          "version": "2.51.0"
-        },
-        "sntp": {
-          "version": "0.2.4"
+          "version": "2.51.0",
+          "dependencies": {
+            "aws-sign2": {
+              "version": "0.5.0"
+            },
+            "bl": {
+              "version": "0.9.5",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.34"
+                }
+              }
+            },
+            "caseless": {
+              "version": "0.8.0"
+            },
+            "combined-stream": {
+              "version": "0.0.7",
+              "dependencies": {
+                "delayed-stream": {
+                  "version": "0.0.5"
+                }
+              }
+            },
+            "forever-agent": {
+              "version": "0.5.2"
+            },
+            "form-data": {
+              "version": "0.2.0",
+              "dependencies": {
+                "async": {
+                  "version": "0.9.2"
+                },
+                "mime-types": {
+                  "version": "2.0.14",
+                  "dependencies": {
+                    "mime-db": {
+                      "version": "1.12.0"
+                    }
+                  }
+                }
+              }
+            },
+            "hawk": {
+              "version": "1.1.1",
+              "dependencies": {
+                "boom": {
+                  "version": "0.4.2"
+                },
+                "cryptiles": {
+                  "version": "0.2.2"
+                },
+                "hoek": {
+                  "version": "0.9.1"
+                },
+                "sntp": {
+                  "version": "0.2.4"
+                }
+              }
+            },
+            "http-signature": {
+              "version": "0.10.1",
+              "dependencies": {
+                "asn1": {
+                  "version": "0.1.11"
+                },
+                "assert-plus": {
+                  "version": "0.1.5"
+                },
+                "ctype": {
+                  "version": "0.5.3"
+                }
+              }
+            },
+            "mime-types": {
+              "version": "1.0.2"
+            },
+            "oauth-sign": {
+              "version": "0.5.0"
+            },
+            "qs": {
+              "version": "2.3.3"
+            }
+          }
         },
         "which": {
-          "version": "1.1.1"
+          "version": "1.1.1",
+          "dependencies": {
+            "is-absolute": {
+              "version": "0.1.7",
+              "dependencies": {
+                "is-relative": {
+                  "version": "0.1.3"
+                }
+              }
+            }
+          }
+        },
+        "urijs": {
+          "version": "1.16.1"
+        },
+        "yauzl": {
+          "version": "2.6.0",
+          "dependencies": {
+            "buffer-crc32": {
+              "version": "0.2.5"
+            },
+            "fd-slicer": {
+              "version": "1.0.1",
+              "dependencies": {
+                "pend": {
+                  "version": "1.2.0"
+                }
+              }
+            }
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index 375c7e8e5..18b62137a 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "mocha": "~2.3.2",
     "nlf": "~1.3.2",
     "react-addons-test-utils": "0.14.3",
-    "selenium-standalone": "~4.4.0",
+    "selenium-standalone": "5.5.0",
     "sinon": "1.17.2",
     "webpack-dev-server": "1.14.0"
   }