Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/259685
Change subject: [BrowserTest] Update mediawiki_selenium Ruby gem to the latest version ...................................................................... [BrowserTest] Update mediawiki_selenium Ruby gem to the latest version Bug: T114241 Change-Id: Ic6cf69516a1e36173fbbf6b86494e845721a19d0 --- M Gemfile M Gemfile.lock M modules/ve-mw/tests/browser/environments.yml M modules/ve-mw/tests/browser/features/support/env.rb 4 files changed, 36 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/85/259685/1 diff --git a/Gemfile b/Gemfile index 5cac87e..a6a289a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,7 @@ -# ruby=ruby-2.1.1 -# ruby-gemset=VisualEditor - source 'https://rubygems.org' gem 'commons_upload', '~> 0.0.4' -gem 'mediawiki_selenium', '~> 1.5.0' -gem 'rubocop', require: false +gem 'mediawiki_selenium', '~> 1.6.3' +gem 'rake', '~> 10.4', '>= 10.4.2' +gem 'rubocop', '~> 0.32.1', require: false gem 'screenshot', '~> 0.0.7' diff --git a/Gemfile.lock b/Gemfile.lock index a5b831b..40f5127 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - ast (2.0.0) + ast (2.1.0) 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) - chunky_png (1.3.4) + chunky_png (1.3.5) commons_upload (0.0.4) mediawiki_api (~> 0.4, >= 0.4.1) cucumber (1.3.20) @@ -16,15 +16,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.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) @@ -37,38 +37,41 @@ 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.5.0) + 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.4, >= 0.4.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) watir-webdriver (>= 0.6.11) page_navigation (0.9) data_magic (>= 0.14) - parser (2.2.2.6) + parser (2.2.3.0) ast (>= 1.1, < 3.0) powerpack (0.1.1) 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.32.1) @@ -81,7 +84,7 @@ rubyzip (1.1.7) screenshot (0.0.7) chunky_png (~> 1.3.3) - selenium-webdriver (2.47.1) + selenium-webdriver (2.48.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -91,16 +94,17 @@ 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 commons_upload (~> 0.0.4) - mediawiki_selenium (~> 1.5.0) - rubocop + mediawiki_selenium (~> 1.6.3) + rake (~> 10.4, >= 10.4.2) + rubocop (~> 0.32.1) screenshot (~> 0.0.7) diff --git a/modules/ve-mw/tests/browser/environments.yml b/modules/ve-mw/tests/browser/environments.yml index d52e287..35eb153 100644 --- a/modules/ve-mw/tests/browser/environments.yml +++ b/modules/ve-mw/tests/browser/environments.yml @@ -14,28 +14,26 @@ # 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_api_url: http://127.0.0.1:8080/w/api.php - mediawiki_user: Selenium_user - mediawiki_password: vagrant mw-vagrant-guest: + user_factory: true mediawiki_url: http://127.0.0.1/wiki/ - mediawiki_api_url: http://127.0.0.1:8080/w/api.php - mediawiki_user: Selenium_user - mediawiki_password: vagrant -beta: &default +beta: mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ - mediawiki_api_url: http://en.wikipedia.beta.wmflabs.org/w/api.php mediawiki_user: Selenium_user # mediawiki_password: SET THIS IN THE ENVIRONMENT! test2: mediawiki_url: http://test2.wikipedia.org/wiki/ - mediawiki_api_url: http://test2.wikipedia.org/w/api.php 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/modules/ve-mw/tests/browser/features/support/env.rb b/modules/ve-mw/tests/browser/features/support/env.rb index d26c965..3e48d00 100644 --- a/modules/ve-mw/tests/browser/features/support/env.rb +++ b/modules/ve-mw/tests/browser/features/support/env.rb @@ -1,5 +1,5 @@ -require 'mediawiki_selenium' -require 'mediawiki_selenium/support' +require 'mediawiki_selenium/cucumber' +require 'mediawiki_selenium/pages' require 'mediawiki_selenium/step_definitions' require 'screenshot' -- To view, visit https://gerrit.wikimedia.org/r/259685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6cf69516a1e36173fbbf6b86494e845721a19d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
