Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/279610
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: I02fc3e8542d732ca728f47316a8e183ed28744e7 --- M Gemfile M Gemfile.lock M Rakefile A tests/browser/ci.yml M tests/browser/environments.yml 5 files changed, 45 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles refs/changes/10/279610/1 diff --git a/Gemfile b/Gemfile index b338dbf..0a9f8e2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.6.3' +gem 'mediawiki_selenium', + git: 'https://github.com/zeljkofilipin/mediawiki-selenium.git', + branch: 'T128190-2' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.29.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index fcd9fea..d0f35bc 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: @@ -5,7 +22,7 @@ astrolabe (1.3.1) parser (~> 2.2) builder (3.2.2) - childprocess (0.5.8) + childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.20) builder (>= 2.1.2) @@ -17,9 +34,9 @@ faker (>= 1.1.2) yml_reader (>= 0.6) diff-lcs (1.2.5) - domain_name (0.5.25) + 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) @@ -29,7 +46,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) @@ -37,23 +54,12 @@ mediawiki_api (0.5.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - 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.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) netrc (0.11.0) - page-object (1.1.0) + page-object (1.1.1) page_navigation (>= 0.9) selenium-webdriver (>= 2.44.0) watir-webdriver (>= 0.6.11) @@ -78,26 +84,28 @@ rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) - rubyzip (1.1.7) - selenium-webdriver (2.48.1) + 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) thor (0.19.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) + unf_ext (0.0.7.2) watir-webdriver (0.9.1) selenium-webdriver (>= 2.46.2) websocket (1.2.2) - yml_reader (0.6) + yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.6.3) + mediawiki_selenium! rake (~> 10.4, >= 10.4.2) rubocop (~> 0.29.1) + +BUNDLED WITH + 1.10.6 diff --git a/Rakefile b/Rakefile index d6feb16..8ac239f 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..dee421d --- /dev/null +++ b/tests/browser/ci.yml @@ -0,0 +1,6 @@ +MEDIAWIKI_ENVIRONMENT: + - beta-desktop + - beta-mobile + +BROWSER: + - chrome diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 7afa973..a67c0c6 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -27,12 +27,12 @@ mediawiki_url: http://127.0.0.1/wiki/ user_factory: true -beta_desktop: +beta-desktop: mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ mediawiki_user: Selenium_user # mediawiki_password: SET THIS IN THE ENVIRONMENT! -beta: +beta-mobile: mediawiki_url: http://en.m.wikipedia.beta.wmflabs.org/wiki/ mediawiki_user: Selenium_user # mediawiki_password: SET THIS IN THE ENVIRONMENT! -- To view, visit https://gerrit.wikimedia.org/r/279610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02fc3e8542d732ca728f47316a8e183ed28744e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RelatedArticles 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