Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/285370
Change subject: Migration of browsertests* Jenkins jobs to selenium* jobs ...................................................................... Migration of browsertests* Jenkins jobs to selenium* jobs selenium* jobs are a new way of running Ruby based Selenium tests. The jobs are triggered daily. Bug: T128190 Change-Id: If0e6b61c9e3d52005d1851ca49ef65babd002919 (cherry picked from commit afe0397991171e0e31450c837f6248c573c77687) --- M Gemfile M Gemfile.lock M Rakefile A tests/browser/ci.yml M tests/browser/environments.yml M tests/browser/features/mmv.download.feature M tests/browser/features/mmv.navigation.feature M tests/browser/features/mmv.options.feature M tests/browser/features/mmv.performance.feature M tests/browser/features/step_definitions/mmv_steps.rb 10 files changed, 113 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/70/285370/1 diff --git a/Gemfile b/Gemfile index a3e2a94..cd8b19f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.6.4' +gem 'mediawiki_selenium', '~> 1.7' +gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.35.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index c26b10b..2d25514 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,9 +17,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 +29,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,7 +37,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) + mediawiki_selenium (1.7.0) cucumber (~> 1.3, >= 1.3.20) headless (~> 2.0, >= 2.1.0) json (~> 1.8, >= 1.8.1) @@ -48,8 +48,8 @@ rspec-expectations (~> 2.14, >= 2.14.4) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) - mime-types (2.99) - multi_json (1.11.2) + mime-types (2.99.1) + multi_json (1.11.3) multi_test (0.1.2) multipart-post (2.0.0) netrc (0.11.0) @@ -63,6 +63,7 @@ ast (>= 1.1, < 3.0) powerpack (0.1.1) rainbow (2.0.0) + rake (11.1.2) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -78,10 +79,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,17 +89,18 @@ 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) + websocket (1.2.3) yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.6.4) + mediawiki_selenium (~> 1.7) + 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..80ab1ed --- /dev/null +++ b/tests/browser/ci.yml @@ -0,0 +1,86 @@ +BROWSER: + - chrome + - firefox + - internet_explorer 9.0 + - internet_explorer 10.0 + - internet_explorer 11.0 + - safari + +MEDIAWIKI_ENVIRONMENT: + - beta + - mediawiki + +PLATFORM: + - Linux + - OS X 10.9 + - Windows 7 + - Windows 8 + - Windows 8.1 + +exclude: + - BROWSER: chrome + MEDIAWIKI_ENVIRONMENT: mediawiki + + - BROWSER: chrome + PLATFORM: Linux + - BROWSER: chrome + PLATFORM: Windows 7 + - BROWSER: chrome + PLATFORM: Windows 8 + - BROWSER: chrome + PLATFORM: Windows 8.1 + + - BROWSER: firefox + PLATFORM: OS X 10.9 + - BROWSER: firefox + PLATFORM: Windows 7 + - BROWSER: firefox + PLATFORM: Windows 8 + - BROWSER: firefox + PLATFORM: Windows 8.1 + + - BROWSER: internet_explorer 9.0 + MEDIAWIKI_ENVIRONMENT: mediawiki + + - BROWSER: internet_explorer 9.0 + PLATFORM: Linux + - BROWSER: internet_explorer 9.0 + PLATFORM: OS X 10.9 + - BROWSER: internet_explorer 9.0 + PLATFORM: Windows 8 + - BROWSER: internet_explorer 9.0 + PLATFORM: Windows 8.1 + + - BROWSER: internet_explorer 10.0 + MEDIAWIKI_ENVIRONMENT: mediawiki + + - BROWSER: internet_explorer 10.0 + PLATFORM: Linux + - BROWSER: internet_explorer 10.0 + PLATFORM: OS X 10.9 + - BROWSER: internet_explorer 10.0 + PLATFORM: Windows 7 + - BROWSER: internet_explorer 10.0 + PLATFORM: Windows 8.1 + + - BROWSER: internet_explorer 11.0 + MEDIAWIKI_ENVIRONMENT: mediawiki + + - BROWSER: internet_explorer 11.0 + PLATFORM: Linux + - BROWSER: internet_explorer 11.0 + PLATFORM: OS X 10.9 + - BROWSER: internet_explorer 11.0 + PLATFORM: Windows 8 + + - BROWSER: safari + MEDIAWIKI_ENVIRONMENT: mediawiki + + - BROWSER: safari + PLATFORM: Linux + - BROWSER: safari + PLATFORM: Windows 7 + - BROWSER: safari + PLATFORM: Windows 8 + - BROWSER: safari + PLATFORM: Windows 8.1 diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 83ba52d..2fec130 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -29,7 +29,7 @@ mediawiki_user: Selenium_user # mediawiki_password: SET THIS IN THE ENVIRONMENT! -mediawiki-org: +mediawiki: browser_useragent: test-user-agent mediawiki_url: https://www.mediawiki.org/wiki/ mediawiki_user: Selenium_user diff --git a/tests/browser/features/mmv.download.feature b/tests/browser/features/mmv.download.feature index 6a9ad6e..7b3ca0d 100644 --- a/tests/browser/features/mmv.download.feature +++ b/tests/browser/features/mmv.download.feature @@ -1,4 +1,4 @@ -@integration @en.wikipedia.beta.wmflabs.org @firefox @chrome @internet_explorer_9 @internet_explorer_10 @internet_explorer_11 @safari @test2.wikipedia.org +@chrome @en.wikipedia.beta.wmflabs.org @firefox @integration @internet_explorer @safari @test2.wikipedia.org Feature: Download menu Background: @@ -56,4 +56,4 @@ And I click the large download size And the download size options disappears Then the download image size label should be "1200 × 900 px jpg" - And the download links should be the 1200 thumbnail \ No newline at end of file + And the download links should be the 1200 thumbnail diff --git a/tests/browser/features/mmv.navigation.feature b/tests/browser/features/mmv.navigation.feature index 0efa966..ce0a440 100644 --- a/tests/browser/features/mmv.navigation.feature +++ b/tests/browser/features/mmv.navigation.feature @@ -1,4 +1,4 @@ -@integration @en.wikipedia.beta.wmflabs.org @firefox @chrome @internet_explorer_9 @internet_explorer_10 @internet_explorer_11 @safari @test2.wikipedia.org +@chrome @en.wikipedia.beta.wmflabs.org @firefox @integration @internet_explorer @safari @test2.wikipedia.org Feature: Navigation Background: @@ -20,4 +20,4 @@ Scenario: Browsing back to close MMV restores the scroll position When I press the browser back button Then I should be navigated back to the original wiki article - And the wiki article should be scrolled to the same position as before opening MMV \ No newline at end of file + And the wiki article should be scrolled to the same position as before opening MMV diff --git a/tests/browser/features/mmv.options.feature b/tests/browser/features/mmv.options.feature index 340a48c..a471f6a 100644 --- a/tests/browser/features/mmv.options.feature +++ b/tests/browser/features/mmv.options.feature @@ -1,4 +1,4 @@ -@integration @en.wikipedia.beta.wmflabs.org @firefox @chrome @internet_explorer_9 @internet_explorer_10 @internet_explorer_11 @safari @test2.wikipedia.org +@chrome @en.wikipedia.beta.wmflabs.org @firefox @integration @internet_explorer @safari @test2.wikipedia.org Feature: Options Background: @@ -41,4 +41,4 @@ Scenario: Disabling media viewer makes the next thumbnail click go to the file page Given I disable and close MMV When I click on the first image in the article - Then I am taken to the file page \ No newline at end of file + Then I am taken to the file page diff --git a/tests/browser/features/mmv.performance.feature b/tests/browser/features/mmv.performance.feature index f489a71..0862cf3 100644 --- a/tests/browser/features/mmv.performance.feature +++ b/tests/browser/features/mmv.performance.feature @@ -1,4 +1,4 @@ -@en.wikipedia.beta.wmflabs.org @custom-browser @www.mediawiki.org @firefox @internet_explorer_9 @internet_explorer_10 @internet_explorer_11 @test2.wikipedia.org +@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer @www.mediawiki.org @safari @test2.wikipedia.org Feature: Multimedia Viewer performance Background: diff --git a/tests/browser/features/step_definitions/mmv_steps.rb b/tests/browser/features/step_definitions/mmv_steps.rb index 4d52b2f..6eea022 100644 --- a/tests/browser/features/step_definitions/mmv_steps.rb +++ b/tests/browser/features/step_definitions/mmv_steps.rb @@ -1,7 +1,7 @@ # encoding: utf-8 Given /^I am at a wiki article with at least two embedded pictures$/ do - api.create_page 'MediaViewerE2ETest', File.read('samples/MediaViewerE2ETest.wikitext') + api.create_page 'MediaViewerE2ETest', File.read(File.join(__dir__, '../../samples/MediaViewerE2ETest.wikitext')) visit(E2ETestPage) on(E2ETestPage).image1_in_article_element.when_present.should be_visible end -- To view, visit https://gerrit.wikimedia.org/r/285370 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: wmf/1.27.0-wmf.21 Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
