Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/279601
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: If0e6b61c9e3d52005d1851ca49ef65babd002919 --- M Gemfile M Gemfile.lock M Rakefile A tests/browser/ci.yml M tests/browser/environments.yml 5 files changed, 101 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/01/279601/1 diff --git a/Gemfile b/Gemfile index a3e2a94..0a015d4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,7 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.6.4' +gem 'mediawiki_selenium', + git: 'https://github.com/zeljkofilipin/mediawiki-selenium.git', + branch: 'T128190-2' +gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.35.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index c26b10b..e9115f1 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: @@ -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,18 +54,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) @@ -63,6 +69,7 @@ ast (>= 1.1, < 3.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) @@ -78,10 +85,9 @@ ruby-progressbar (~> 1.7) tins (<= 1.6.0) ruby-progressbar (1.7.5) - rubyzip (1.1.7) - selenium-webdriver (2.49.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) @@ -89,7 +95,7 @@ tins (1.6.0) 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) @@ -99,7 +105,8 @@ ruby DEPENDENCIES - mediawiki_selenium (~> 1.6.4) + mediawiki_selenium! + rake (~> 11.1, >= 11.1.1) rubocop (~> 0.35.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..2103818 --- /dev/null +++ b/tests/browser/ci.yml @@ -0,0 +1,9 @@ +MEDIAWIKI_ENVIRONMENT: + - beta-linux-firefox + - beta-mac-chrome + - beta-mac-safari + - beta-windows_7-internet_explorer_11 + - beta-windows_7-internet_explorer_9 + - beta-windows_8-internet_explorer_10 + - beta-windows_8_1-internet_explorer_11 + - mediawiki diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 83ba52d..1b87096 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -23,16 +23,72 @@ user_factory: true mediawiki_url: http://127.0.0.1/wiki/ -beta: +beta-linux-firefox: + browser: firefox browser_useragent: test-user-agent mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ mediawiki_user: Selenium_user + platform: Linux # mediawiki_password: SET THIS IN THE ENVIRONMENT! -mediawiki-org: +beta-mac-chrome: + browser: chrome + browser_useragent: test-user-agent + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + platform: OS X 10.9 + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +beta-mac-safari: + browser: safari + browser_useragent: test-user-agent + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + platform: OS X 10.9 + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +beta-windows_7-internet_explorer_11: + browser: internet_explorer + browser_useragent: test-user-agent + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + platform: Windows 7 + version: 11.0 + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +beta-windows_7-internet_explorer_9: + browser: internet_explorer + browser_useragent: test-user-agent + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + platform: Windows 7 + version: 9.0 + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +beta-windows_8-internet_explorer_10: + browser: internet_explorer + browser_useragent: test-user-agent + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + platform: Windows 8 + version: 10.0 + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +beta-windows_8_1-internet_explorer_11: + browser: internet_explorer + browser_useragent: test-user-agent + mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/ + mediawiki_user: Selenium_user + platform: Windows 8.1 + version: 11.0 + # mediawiki_password: SET THIS IN THE ENVIRONMENT! + +mediawiki: + browser: firefox browser_useragent: test-user-agent mediawiki_url: https://www.mediawiki.org/wiki/ mediawiki_user: Selenium_user + platform: Linux # mediawiki_password: SET THIS IN THE ENVIRONMENT! integration: -- To view, visit https://gerrit.wikimedia.org/r/279601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0e6b61c9e3d52005d1851ca49ef65babd002919 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer 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