Gergő Tisza has submitted this change and it was merged. 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: I3be30ef850f6bca711c930ed529c93edfb157fd8 (cherry picked from commit 95ad26a2603000da2429e2f8bf19c1004765bc65) --- M Gemfile M Gemfile.lock M Rakefile A tests/browser/ci.yml M tests/browser/features/editor_ve.feature M tests/browser/features/search.feature M tests/browser/features/special_watchlist.feature M tests/browser/features/watchstar.feature 8 files changed, 40 insertions(+), 34 deletions(-) Approvals: Gergő Tisza: Verified; Looks good to me, approved diff --git a/Gemfile b/Gemfile index 53577ea..eb513ca 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ gem 'chunky_png', '~> 1.3.4' gem 'jsduck', '~> 5.3.4' -gem 'mediawiki_selenium', '~> 1.6.5' +gem 'mediawiki_selenium', '~> 1.7' +gem 'page-object', '1.1.0' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.29.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index f118452..ee3f480 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - ast (2.0.0) - astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) + ast (2.2.0) + astrolabe (1.3.1) + parser (~> 2.2) builder (3.2.2) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.3.4) + chunky_png (1.3.5) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -19,9 +19,9 @@ yml_reader (>= 0.6) diff-lcs (1.2.5) dimensions (1.2.0) - 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) @@ -31,7 +31,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) @@ -41,11 +41,11 @@ parallel (~> 0.7.1) rdiscount (~> 2.1.6) rkelly-remix (~> 0.0.4) - json (1.8.2) + json (1.8.3) 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) @@ -56,8 +56,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) @@ -68,11 +68,11 @@ page_navigation (0.9) data_magic (>= 0.14) parallel (0.7.1) - parser (2.2.0.3) - ast (>= 1.1, < 3.0) - powerpack (0.1.0) - rainbow (2.0.0) - rake (10.4.2) + parser (2.3.0.7) + ast (~> 2.2) + powerpack (0.1.1) + rainbow (2.1.0) + rake (10.5.0) rdiscount (2.1.8) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) @@ -88,11 +88,10 @@ powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) - ruby-progressbar (1.7.1) - rubyzip (1.1.7) - selenium-webdriver (2.50.0) + ruby-progressbar (1.8.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) @@ -102,7 +101,7 @@ 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 @@ -111,7 +110,8 @@ DEPENDENCIES chunky_png (~> 1.3.4) jsduck (~> 5.3.4) - mediawiki_selenium (~> 1.6.5) + mediawiki_selenium (~> 1.7) + page-object (= 1.1.0) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.29.1) 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..c2eca93 --- /dev/null +++ b/tests/browser/ci.yml @@ -0,0 +1,9 @@ +BROWSER: + - chrome + - firefox + +MEDIAWIKI_ENVIRONMENT: + - beta + +PLATFORM: + - Linux diff --git a/tests/browser/features/editor_ve.feature b/tests/browser/features/editor_ve.feature index 06e6f62..2f38719 100644 --- a/tests/browser/features/editor_ve.feature +++ b/tests/browser/features/editor_ve.feature @@ -1,4 +1,4 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @extension-visualeditor @firefox @vagrant +@chrome @editing @en.m.wikipedia.beta.wmflabs.org @extension-visualeditor @firefox @skip @vagrant Feature: VisualEditor Mobile # Tests are skipped due to https://phabricator.wikimedia.org/T88559 @@ -7,19 +7,16 @@ And I am in beta mode And I am editing a new article with VisualEditor - @editing @skip Scenario: Switch from VisualEditor to source editor When I switch to editing the source And I see the wikitext editor overlay And I click the wikitext editor overlay close button Then I should not see the wikitext editor overlay - @editing @skip Scenario: I can edit a page using VisualEditor When I edit the article using VisualEditor Then I should see the edit reflected in the article content - @editing @skip Scenario: Going back from save screen in VisualEditor When I click the escape button Then I should see the article content diff --git a/tests/browser/features/search.feature b/tests/browser/features/search.feature index 0f9e51b..3a25e70 100644 --- a/tests/browser/features/search.feature +++ b/tests/browser/features/search.feature @@ -1,4 +1,4 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @test2.m.wikipedia.org @vagrant +@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @skip @test2.m.wikipedia.org @vagrant Feature: Search Background: diff --git a/tests/browser/features/special_watchlist.feature b/tests/browser/features/special_watchlist.feature index bca584f..84f752e 100644 --- a/tests/browser/features/special_watchlist.feature +++ b/tests/browser/features/special_watchlist.feature @@ -1,4 +1,4 @@ -@chrome @firefox @test2.m.wikipedia.org @vagrant +@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @integration @skip @test2.m.wikipedia.org @vagrant Feature: Manage Watchlist Background: @@ -6,7 +6,6 @@ And I have recently edited pages on my watchlist And I am on the "Special:EditWatchlist" page - @integration Scenario: Switching to Feed view When I switch to the modified view of the watchlist And I click the Pages tab @@ -14,7 +13,6 @@ Then I should see a list of diff summary links And the modified button should be selected - @integration Scenario: Switching to List view When I switch to the modified view of the watchlist And I switch to the list view of the watchlist diff --git a/tests/browser/features/watchstar.feature b/tests/browser/features/watchstar.feature index 0d56eaa..5340ed2 100644 --- a/tests/browser/features/watchstar.feature +++ b/tests/browser/features/watchstar.feature @@ -1,17 +1,15 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @test2.m.wikipedia.org @vagrant +@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @integration @skip @smoke @test2.m.wikipedia.org @vagrant Feature: Manage Watchlist Background: Given I am logged into the mobile website - @smoke @integration Scenario: Add an article to the watchlist Given I am viewing an unwatched page When I click the watch star Then I should see a toast with message about watching the page And the watch star should be selected - @smoke @integration Scenario: Remove an article from the watchlist Given I am viewing a watched page When I click the unwatch star -- To view, visit https://gerrit.wikimedia.org/r/296522 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3be30ef850f6bca711c930ed529c93edfb157fd8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: REL1_27 Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
