Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/255369
Change subject: Update mediawiki_selenium Ruby gem to the latest version ...................................................................... Update mediawiki_selenium Ruby gem to the latest version Bug: T117980 Change-Id: Ia22fdd01c596090222e85ea06b19df6271ede1a9 --- M Gemfile M Gemfile.lock A tests/browser/environments.yml M tests/browser/features/support/env.rb 4 files changed, 105 insertions(+), 56 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PdfHandler refs/changes/69/255369/1 diff --git a/Gemfile b/Gemfile index d6fba3b..45f75d7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,4 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=browsertests - source "https://rubygems.org"; -gem "mediawiki_selenium" -gem "rubocop", require: false +gem "mediawiki_selenium", "~> 1.6.2" +gem "rubocop", "~> 0.26.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 1473658..7afed8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,55 +1,74 @@ GEM remote: https://rubygems.org/ specs: - ast (2.0.0) - astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) + ast (2.1.0) + astrolabe (1.3.1) + parser (~> 2.2) builder (3.2.2) - childprocess (0.5.3) + childprocess (0.5.8) ffi (~> 1.0, >= 1.0.11) - cucumber (1.3.15) + cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) - data_magic (0.19) + multi_test (>= 0.1.2) + data_magic (0.21) faker (>= 1.1.2) - yml_reader (>= 0.3) + yml_reader (>= 0.4) diff-lcs (1.2.5) - faker (1.3.0) + domain_name (0.5.25) + unf (>= 0.0.5, < 1.0.0) + faker (1.6.1) i18n (~> 0.5) - ffi (1.9.3) + 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) gherkin (2.12.2) multi_json (~> 1.3) - headless (1.0.2) - i18n (0.6.9) - json (1.8.1) - mediawiki_selenium (0.2.25) - cucumber (~> 1.3, >= 1.3.10) - headless (~> 1.0, >= 1.0.1) + headless (2.2.0) + http-cookie (1.0.2) + domain_name (~> 0.5) + i18n (0.7.0) + json (1.8.3) + mediawiki_api (0.5.0) + faraday (~> 0.9, >= 0.9.0) + faraday-cookie_jar (~> 0.0, >= 0.0.6) + mediawiki_selenium (1.6.2) + cucumber (~> 1.3, >= 1.3.20) + headless (~> 2.0, >= 2.1.0) json (~> 1.8, >= 1.8.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) - mime-types (2.3) - multi_json (1.10.1) - multi_test (0.1.1) - page-object (1.0) + thor (~> 0.19, >= 0.19.1) + mime-types (2.99) + multi_json (1.11.2) + multi_test (0.1.2) + multipart-post (2.0.0) + netrc (0.11.0) + page-object (1.1.0) page_navigation (>= 0.9) - selenium-webdriver (>= 2.42.0) - watir-webdriver (>= 0.6.9) + selenium-webdriver (>= 2.44.0) + watir-webdriver (>= 0.6.11) page_navigation (0.9) data_magic (>= 0.14) - parser (2.2.0.pre.4) + parser (2.3.0.pre.3) ast (>= 1.1, < 3.0) - slop (~> 3.4, >= 3.4.5) powerpack (0.0.9) rainbow (2.0.0) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-expectations (2.99.1) + rest-client (1.8.0) + 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.26.1) astrolabe (~> 1.3) @@ -57,23 +76,26 @@ powerpack (~> 0.0.6) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) - ruby-progressbar (1.6.0) - rubyzip (1.1.4) - selenium-webdriver (2.42.0) - childprocess (>= 0.5.0) + ruby-progressbar (1.7.5) + rubyzip (1.1.7) + selenium-webdriver (2.48.1) + childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) - websocket (~> 1.0.4) - slop (3.6.0) + websocket (~> 1.0) syntax (1.2.0) - watir-webdriver (0.6.10) - selenium-webdriver (>= 2.18.0) - websocket (1.0.7) - yml_reader (0.3) + thor (0.19.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) + watir-webdriver (0.9.1) + selenium-webdriver (>= 2.46.2) + websocket (1.2.2) + yml_reader (0.5) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium - rubocop + mediawiki_selenium (~> 1.6.2) + rubocop (~> 0.26.1) diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml new file mode 100644 index 0000000..35eb153 --- /dev/null +++ b/tests/browser/environments.yml @@ -0,0 +1,39 @@ +# Customize this configuration as necessary to provide defaults for various +# test environments. +# +# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT +# environment variable. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# bundle exec cucumber +# +# Additional variables set by the environment will override the corresponding +# defaults defined here. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# export MEDIAWIKI_USER=Selenium_user2 +# bundle exec cucumber +# +mw-vagrant-host: &default + user_factory: true + mediawiki_url: http://127.0.0.1:8080/wiki/ + +mw-vagrant-guest: + user_factory: true + mediawiki_url: http://127.0.0.1/wiki/ + +beta: + mediawiki_url: http://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_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 515ff78..c1072b2 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,12 +1,3 @@ -# -# This file is subject to the license terms in the LICENSE file found in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of -# qa-browsertests, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the LICENSE file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS -# -require "mediawiki_selenium" +require 'mediawiki_selenium/cucumber' +require 'mediawiki_selenium/pages' +require 'mediawiki_selenium/step_definitions' -- To view, visit https://gerrit.wikimedia.org/r/255369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia22fdd01c596090222e85ea06b19df6271ede1a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PdfHandler Gerrit-Branch: master Gerrit-Owner: Zfilipin <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
