Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/279354
Change subject: WIP Simplify creating of Jenkins jobs for running browser tests daily ...................................................................... WIP Simplify creating of Jenkins jobs for running browser tests daily Bug: T128190 Change-Id: Ib422e10d049df4e88eca281f7b8b16e39d79dfbd --- M Gemfile M Gemfile.lock M Rakefile A tests/browser/ci.yml M tests/browser/environments.yml 5 files changed, 45 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/54/279354/1 diff --git a/Gemfile b/Gemfile index e041210..f79b420 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,8 @@ source "https://rubygems.org"; gem "csscss", "~> 1.3.3" -gem 'mediawiki_selenium', '1.6.5' +gem 'mediawiki_selenium', + git: 'https://github.com/zeljkofilipin/mediawiki-selenium.git', + branch: 'T128190-2' +gem 'rake', '~> 11.1', '>= 11.1.1' gem "rubocop", "~> 0.32.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 4dada44..deb0313 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,20 @@ +GIT + remote: https://github.com/zeljkofilipin/mediawiki-selenium.git + revision: 097143b5e8f513f5f74cc8b1fc99d725510897c7 + branch: T128190-2 + specs: + mediawiki_selenium (1.6.5) + 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) + thor (~> 0.19, >= 0.19.1) + GEM remote: https://rubygems.org/ specs: @@ -22,9 +39,9 @@ faker (>= 1.1.2) yml_reader (>= 0.6) diff-lcs (1.2.5) - domain_name (0.5.20160128) + domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) - faker (1.6.1) + faker (1.6.3) i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -34,7 +51,7 @@ ffi (1.9.10) gherkin (2.12.2) multi_json (~> 1.3) - headless (2.2.0) + headless (2.2.3) http-cookie (1.0.2) domain_name (~> 0.5) i18n (0.7.0) @@ -42,18 +59,7 @@ mediawiki_api (0.5.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (1.6.5) - 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) - thor (~> 0.19, >= 0.19.1) - mime-types (2.99) + mime-types (2.99.1) multi_json (1.11.2) multi_test (0.1.2) multipart-post (2.0.0) @@ -70,6 +76,7 @@ blankslate (>= 2.0, <= 4.0) powerpack (0.1.1) rainbow (2.0.0) + rake (11.1.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -84,10 +91,9 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) - rubyzip (1.1.7) - selenium-webdriver (2.50.0) + rubyzip (1.2.0) + selenium-webdriver (2.53.0) childprocess (~> 0.5) - multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0) syntax (1.2.0) @@ -105,7 +111,8 @@ DEPENDENCIES csscss (~> 1.3.3) - mediawiki_selenium (= 1.6.5) + mediawiki_selenium! + rake (~> 11.1, >= 11.1.1) rubocop (~> 0.32.1) BUNDLED WITH diff --git a/Rakefile b/Rakefile index 6eef121..2877bf6 100644 --- a/Rakefile +++ b/Rakefile @@ -8,6 +8,9 @@ task.options = ['-c', '.rubocop.yml'] end +require 'mediawiki_selenium/rake_task' +MediawikiSelenium::RakeTask.new + task default: [:test] desc 'Run all build/tests commands (CI entry point)' diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml new file mode 100644 index 0000000..bc73308 --- /dev/null +++ b/tests/browser/ci.yml @@ -0,0 +1,3 @@ +MEDIAWIKI_ENVIRONMENT: + - beta-chrome + - beta-firefox diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 6113b77..bc1e1e6 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -28,7 +28,15 @@ mediawiki_user_b: Selenium Flow user 2 mediawiki_url: http://127.0.0.1:8080/wiki/ -beta: +beta-chrome: + browser: chrome + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + mediawiki_user_b: Selenium Flow user 2 + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +beta-firefox: + browser: firefox mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ mediawiki_user: Selenium_user mediawiki_user_b: Selenium Flow user 2 -- To view, visit https://gerrit.wikimedia.org/r/279354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib422e10d049df4e88eca281f7b8b16e39d79dfbd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow 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
