From 282e13a0c219d3ceafce978903127dedf5bf0beb Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=BDeljko=20Filipin?= Date: Thu, 10 Dec 2015 17:26:13 +0100 Subject: [PATCH] Update mediawiki_selenium Ruby gem from 1.2.1 to 1.6.3 Bring in User factory and support for IE/Android among other things. Bug: T114241 Change-Id: Ie0b0eb924e010533f34408b2fe3eef5b926b1cd9 --- Gemfile | 7 ++--- Gemfile.lock | 43 +++++++++++++-------------- tests/browser/environments.yml | 10 ++++--- tests/browser/features/support/env.rb | 5 ++-- 4 files changed, 31 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index 392558ce8f..ee09906560 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,4 @@ -# ruby=ruby-2.1.2 -# ruby-gemset=core - source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.2.1' -gem 'rubocop', require: false +gem 'mediawiki_selenium', '~> 1.6.3' +gem 'rubocop', '~> 0.32.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3a695ef75a..4d0203a430 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) builder (3.2.2) - childprocess (0.5.6) + childprocess (0.5.8) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -13,15 +13,15 @@ GEM gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - data_magic (0.21) + data_magic (0.22) faker (>= 1.1.2) - yml_reader (>= 0.4) + yml_reader (>= 0.6) diff-lcs (1.2.5) - domain_name (0.5.24) + domain_name (0.5.25) unf (>= 0.0.5, < 1.0.0) - faker (1.4.3) + faker (1.6.1) i18n (~> 0.5) - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -29,29 +29,30 @@ GEM ffi (1.9.10) gherkin (2.12.2) multi_json (~> 1.3) - headless (1.0.2) + headless (2.2.0) http-cookie (1.0.2) domain_name (~> 0.5) i18n (0.7.0) json (1.8.3) - mediawiki_api (0.4.1) + mediawiki_api (0.5.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (1.2.1) - cucumber (~> 1.3, >= 1.3.10) - headless (~> 1.0, >= 1.0.1) + mediawiki_selenium (1.6.3) + cucumber (~> 1.3, >= 1.3.20) + headless (~> 2.0, >= 2.1.0) json (~> 1.8, >= 1.8.1) - mediawiki_api (~> 0.2, >= 0.2.1) + mediawiki_api (~> 0.5, >= 0.5.0) page-object (~> 1.0) rest-client (~> 1.6, >= 1.6.7) + rspec-core (~> 2.14, >= 2.14.4) rspec-expectations (~> 2.14, >= 2.14.4) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) - mime-types (2.6.1) + mime-types (2.99) multi_json (1.11.2) multi_test (0.1.2) multipart-post (2.0.0) - netrc (0.10.3) + netrc (0.11.0) page-object (1.1.0) page_navigation (>= 0.9) selenium-webdriver (>= 2.44.0) @@ -66,6 +67,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) + rspec-core (2.99.2) rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) rubocop (0.32.1) @@ -76,7 +78,7 @@ GEM ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) rubyzip (1.1.7) - selenium-webdriver (2.46.2) + selenium-webdriver (2.48.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -86,17 +88,14 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.1) - watir-webdriver (0.8.0) + watir-webdriver (0.9.1) selenium-webdriver (>= 2.46.2) websocket (1.2.2) - yml_reader (0.5) + yml_reader (0.6) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.2.1) - rubocop - -BUNDLED WITH - 1.10.5 + mediawiki_selenium (~> 1.6.3) + rubocop (~> 0.32.1) diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index b2232e628f..35eb153f04 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -15,14 +15,12 @@ # bundle exec cucumber # mw-vagrant-host: &default + user_factory: true mediawiki_url: http://127.0.0.1:8080/wiki/ - mediawiki_user: Selenium_user - mediawiki_password: vagrant mw-vagrant-guest: + user_factory: true mediawiki_url: http://127.0.0.1/wiki/ - mediawiki_user: Selenium_user - mediawiki_password: vagrant beta: mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ @@ -34,4 +32,8 @@ test2: mediawiki_user: Selenium_user # mediawiki_password: SET THIS IN THE ENVIRONMENT! +integration: + user_factory: true + # mediawiki_url: THIS WILL BE SET BY JENKINS + default: *default diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb index 5eff4ce5cc..c1072b26a2 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,4 +1,3 @@ -require 'mediawiki_selenium' - -require 'mediawiki_selenium/support' +require 'mediawiki_selenium/cucumber' +require 'mediawiki_selenium/pages' require 'mediawiki_selenium/step_definitions' -- 2.20.1