Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/259690
Change subject: Update mediawiki_selenium Ruby gem to the latest version ...................................................................... Update mediawiki_selenium Ruby gem to the latest version Bug: T114241 Change-Id: I4104fc282dc20844bb3e8afec3ed1100ed40cd49 --- M Gemfile M Gemfile.lock M tests/browser/environments.yml M tests/browser/features/support/env.rb 4 files changed, 40 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal refs/changes/90/259690/1 diff --git a/Gemfile b/Gemfile index 45aa329..a9dfaa3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source "https://rubygems.org"; -gem "mediawiki_selenium", "~> 1.0.0.pre.1" +gem "mediawiki_selenium", "~> 1.6.3" +gem "rake", "~> 10.4", ">= 10.4.2" gem "rubocop", "~> 0.28.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index eecb09c..f422a16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ astrolabe (1.3.1) parser (~> 2.2) 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 @@ 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.5.0) + 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,7 +29,7 @@ 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) @@ -37,21 +37,22 @@ mediawiki_api (0.5.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (1.0.2) - 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.2) + 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) @@ -62,10 +63,12 @@ ast (>= 1.1, < 3.0) powerpack (0.0.9) rainbow (2.0.0) + rake (10.4.2) 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.28.0) @@ -76,7 +79,7 @@ ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) rubyzip (1.1.7) - selenium-webdriver (2.47.1) + selenium-webdriver (2.48.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -86,14 +89,15 @@ 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.0.0.pre.1) + mediawiki_selenium (~> 1.6.3) + rake (~> 10.4, >= 10.4.2) rubocop (~> 0.28.0) diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 4dd500d..3a0a85d 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -14,15 +14,13 @@ # export MEDIAWIKI_USER=Selenium_user2 # bundle exec cucumber # -mw-vagrant-host: +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/ @@ -35,3 +33,14 @@ # mediawiki_password_partner: SET THIS IN THE ENVIRONMENT! mediawiki_user_admin: TestCucumberAdmin # mediawiki_password_admin: 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 95a810a..c1072b2 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,6 +1,3 @@ -require "mediawiki_selenium" - -require "mediawiki_selenium/support/env" -require "mediawiki_selenium/support/hooks" -#require "mediawiki_selenium/support/pages" -require "mediawiki_selenium/step_definitions" +require 'mediawiki_selenium/cucumber' +require 'mediawiki_selenium/pages' +require 'mediawiki_selenium/step_definitions' -- To view, visit https://gerrit.wikimedia.org/r/259690 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4104fc282dc20844bb3e8afec3ed1100ed40cd49 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ZeroPortal Gerrit-Branch: master Gerrit-Owner: Zfilipin <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
