From f776983204c5591a679bfb552568e9d79d9b30b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=BDeljko=20Filipin?= <zeljko.filipin@gmail.com>
Date: Mon, 27 Feb 2017 16:16:27 +0100
Subject: [PATCH] Update tests to Selenium 3

Bug: T158074
Change-Id: I784fc7bb85f32d5e50b5abb500c51493839ccebe
---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 55 ++++++++++---------
 .../features/step_definitions/shared_steps.rb |  2 +-
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/Gemfile b/Gemfile
index b798dce066..3f10f1dbcf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'commons_upload', '~> 1.0', '>= 1.0.1'
-gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2'
+gem 'mediawiki_selenium', '~> 1.8'
 gem 'rake', '~> 10.4', '>= 10.4.2'
 gem 'rubocop', '~> 0.32.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e581c14d3..e67ecc982f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,8 +4,8 @@ GEM
     ast (2.3.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    builder (3.2.2)
-    childprocess (0.5.9)
+    builder (3.2.3)
+    childprocess (0.6.2)
       ffi (~> 1.0, >= 1.0.11)
     commons_upload (1.0.1)
       mediawiki_api (~> 0.7.0)
@@ -15,13 +15,13 @@ GEM
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    data_magic (0.22)
+    data_magic (1.0)
       faker (>= 1.1.2)
       yml_reader (>= 0.6)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
-    faker (1.6.6)
+    faker (1.7.3)
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -30,40 +30,43 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.14)
+    ffi (1.9.17)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    headless (2.2.3)
+    headless (2.3.1)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    i18n (0.7.0)
-    json (1.8.3)
+    i18n (0.8.1)
+    json (2.0.3)
     mediawiki_api (0.7.0)
       faraday (~> 0.9, >= 0.9.0)
       faraday-cookie_jar (~> 0.0, >= 0.0.6)
       faraday_middleware (~> 0.10, >= 0.10.0)
-    mediawiki_selenium (1.7.2)
+    mediawiki_selenium (1.8.0)
       cucumber (~> 1.3, >= 1.3.20)
       headless (~> 2.0, >= 2.1.0)
-      json (~> 1.8, >= 1.8.1)
+      json (~> 2.0, >= 2.0.2)
       mediawiki_api (~> 0.7, >= 0.7.0)
-      page-object (~> 1.0)
+      page-object (~> 2.0)
       rest-client (~> 1.6, >= 1.6.7)
       rspec-core (~> 2.14, >= 2.14.4)
       rspec-expectations (~> 2.14, >= 2.14.4)
+      selenium-webdriver (~> 3.1.0)
       syntax (~> 1.2, >= 1.2.0)
       thor (~> 0.19, >= 0.19.1)
-    mime-types (2.99.2)
+    mime-types (2.99.3)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
     netrc (0.11.0)
-    page-object (1.2.0)
+    page-object (2.0.0)
+      net-http-persistent (~> 2.9.4)
       page_navigation (>= 0.9)
-      selenium-webdriver (>= 2.44.0)
-      watir-webdriver (>= 0.6.11)
-    page_navigation (0.9)
-      data_magic (>= 0.14)
+      selenium-webdriver (~> 3.0)
+      watir (~> 6.0)
+    page_navigation (0.10)
+      data_magic (>= 0.22)
     parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -83,19 +86,19 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.8.1)
-    rubyzip (1.2.0)
-    selenium-webdriver (2.53.4)
+    rubyzip (1.2.1)
+    selenium-webdriver (3.1.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     syntax (1.2.1)
-    thor (0.19.1)
+    thor (0.19.4)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    watir-webdriver (0.9.3)
-      selenium-webdriver (>= 2.46.2)
-    websocket (1.2.3)
+    watir (6.2.0)
+      selenium-webdriver (~> 3.0)
+    websocket (1.2.4)
     yml_reader (0.7)
 
 PLATFORMS
@@ -103,9 +106,9 @@ PLATFORMS
 
 DEPENDENCIES
   commons_upload (~> 1.0, >= 1.0.1)
-  mediawiki_selenium (~> 1.7, >= 1.7.2)
+  mediawiki_selenium (~> 1.8)
   rake (~> 10.4, >= 10.4.2)
   rubocop (~> 0.32.1)
 
 BUNDLED WITH
-   1.12.5
+   1.14.5
diff --git a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
index 07dcf5694b..9878c13e7d 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
@@ -24,7 +24,7 @@ end
 Given(/^I make the text "(.*?)" be selected$/) do |select_text|
   on(VisualEditorPage) do |page|
     page.content_element.when_present.click
-    require 'watir-webdriver/extensions/select_text'
+    require 'watir/extensions/select_text'
     page.content_element.when_present.select_text select_text
   end
 end