jenkins-bot has submitted this change and it was merged. Change subject: Update repository to mediawiki_selenium Ruby gem 1.x ......................................................................
Update repository to mediawiki_selenium Ruby gem 1.x Bug: T99660 Change-Id: I83a5035dae72b42acf89d74b77c6f920d093fbc8 --- M Gemfile M Gemfile.lock A tests/browser/environments.yml M tests/browser/features/support/env.rb M tests/browser/features/support/pages/wikilove_page.rb 5 files changed, 81 insertions(+), 51 deletions(-) Approvals: Dduvall: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile b/Gemfile index 11e2184..6209ad7 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,4 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=WikiLove - source "https://rubygems.org"; -gem "mediawiki_selenium" +gem "mediawiki_selenium", "~> 1.5.0" gem "rubocop", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 6fbad9f..ca03a28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,56 +5,57 @@ astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) builder (3.2.2) - childprocess (0.5.3) + childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) - cucumber (1.3.16) + 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) - domain_name (0.5.20) + domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) faker (1.4.3) i18n (~> 0.5) - faraday (0.9.0) + faraday (0.9.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - ffi (1.9.3) + 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.6.11) - json (1.8.1) - mediawiki_api (0.2.1) + i18n (0.7.0) + json (1.8.3) + mediawiki_api (0.4.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (0.3.2) - cucumber (~> 1.3, >= 1.3.10) - headless (~> 1.0, >= 1.0.1) + mediawiki_selenium (1.5.0) + 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.4, >= 0.4.1) page-object (~> 1.0) rest-client (~> 1.6, >= 1.6.7) 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) + thor (~> 0.19, >= 0.19.1) + mime-types (2.6.1) + multi_json (1.11.2) + multi_test (0.1.2) multipart-post (2.0.0) - netrc (0.7.7) - page-object (1.0.2) + netrc (0.10.3) + 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) @@ -62,7 +63,8 @@ slop (~> 3.4, >= 3.4.5) powerpack (0.0.9) rainbow (2.0.0) - rest-client (1.7.2) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rspec-expectations (2.99.2) @@ -74,25 +76,26 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.6.0) - rubyzip (1.1.6) - selenium-webdriver (2.42.0) - childprocess (>= 0.5.0) + rubyzip (1.1.7) + selenium-webdriver (2.47.1) + childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) - websocket (~> 1.0.4) + websocket (~> 1.0) slop (3.6.0) syntax (1.2.0) + thor (0.19.1) unf (0.1.4) unf_ext - unf_ext (0.0.6) - watir-webdriver (0.6.10) - selenium-webdriver (>= 2.18.0) - websocket (1.0.7) - yml_reader (0.3) + unf_ext (0.0.7.1) + watir-webdriver (0.8.0) + selenium-webdriver (>= 2.46.2) + websocket (1.2.2) + yml_reader (0.5) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium + mediawiki_selenium (~> 1.5.0) rubocop 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 0a1f94d..57f3e6b 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,12 +1,4 @@ -# -# This file is subject to the license terms in the COPYING file found in the -# WikiLove top-level directory and at -# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FWikiLove/HEAD/COPYING. No part of -# WikiLove, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the COPYING file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# WikiLove top-level directory and at -# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FWikiLove/HEAD/CREDITS -# require "mediawiki_selenium" + +require "mediawiki_selenium/support" +require "mediawiki_selenium/step_definitions" diff --git a/tests/browser/features/support/pages/wikilove_page.rb b/tests/browser/features/support/pages/wikilove_page.rb index 31e6ca4..b69214f 100644 --- a/tests/browser/features/support/pages/wikilove_page.rb +++ b/tests/browser/features/support/pages/wikilove_page.rb @@ -14,8 +14,7 @@ class WikilovePage include PageObject - include URL - page_url URL.url("User:Selenium_user2") + page_url "User:Selenium_user2" select_list(:barnstar_select, id: "mw-wikilove-subtype") span(:barnstars, text: "Barnstars") -- To view, visit https://gerrit.wikimedia.org/r/234527 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83a5035dae72b42acf89d74b77c6f920d093fbc8 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikiLove Gerrit-Branch: master Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
