From 587a284525d1f65fbbf33e314ea9ff5e40368a71 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Mon, 15 Aug 2016 13:43:01 -0600 Subject: [PATCH] Browser tests: update to mw-selenium 1.7.2 and https Bug: T129483 Change-Id: I4526fb9033c0ea0b23249bea507d9cf8f7345afc --- Gemfile | 2 +- Gemfile.lock | 26 +++++++++++++------------- tests/browser/environments.yml | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 19d2f52315..8a349bf040 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.32.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 2d6e65594e..982619abde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,16 +17,18 @@ GEM faker (>= 1.1.2) yml_reader (>= 0.6) diff-lcs (1.2.5) - domain_name (0.5.20160310) + domain_name (0.5.20160615) unf (>= 0.0.5, < 1.0.0) - faker (1.6.3) + faker (1.6.6) i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - ffi (1.9.10) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + ffi (1.9.14) gherkin (2.12.2) multi_json (~> 1.3) headless (2.2.3) @@ -34,14 +36,15 @@ GEM domain_name (~> 0.5) i18n (0.7.0) json (1.8.3) - mediawiki_api (0.6.0) + mediawiki_api (0.7.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (1.7.1) + faraday_middleware (~> 0.10, >= 0.10.0) + mediawiki_selenium (1.7.2) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) json (~> 1.8, >= 1.8.1) - mediawiki_api (~> 0.6, >= 0.6.0) + mediawiki_api (~> 0.7, >= 0.7.0) page-object (~> 1.0) rest-client (~> 1.6, >= 1.6.7) rspec-core (~> 2.14, >= 2.14.4) @@ -53,7 +56,7 @@ GEM multi_test (0.1.2) multipart-post (2.0.0) netrc (0.11.0) - page-object (1.1.1) + page-object (1.2.0) page_navigation (>= 0.9) selenium-webdriver (>= 2.44.0) watir-webdriver (>= 0.6.11) @@ -79,7 +82,7 @@ GEM ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) rubyzip (1.2.0) - selenium-webdriver (2.53.1) + selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) @@ -88,7 +91,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - watir-webdriver (0.9.1) + watir-webdriver (0.9.3) selenium-webdriver (>= 2.46.2) websocket (1.2.3) yml_reader (0.7) @@ -97,9 +100,6 @@ PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.7, >= 1.7.1) + mediawiki_selenium (~> 1.7, >= 1.7.2) rake (~> 11.1, >= 11.1.1) rubocop (~> 0.32.1) - -BUNDLED WITH - 1.10.6 diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 35eb153f04..8740e5d17a 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -23,12 +23,12 @@ mw-vagrant-guest: mediawiki_url: http://127.0.0.1/wiki/ beta: - mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_url: https://en.wikipedia.beta.wmflabs.org/wiki/ mediawiki_user: Selenium_user # mediawiki_password: SET THIS IN THE ENVIRONMENT! test2: - mediawiki_url: http://test2.wikipedia.org/wiki/ + mediawiki_url: https://test2.wikipedia.org/wiki/ mediawiki_user: Selenium_user # mediawiki_password: SET THIS IN THE ENVIRONMENT! -- 2.20.1