jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399130 )
Change subject: Remove Ruby browser tests ...................................................................... Remove Ruby browser tests The continuous integration infrastructure for these is being removed (or never existed), and our team decided not to invest the time to convert them to node.js. Bug: T174589 Change-Id: I77b060a16a484ef65518d3924a8ee1c3ccaf1f23 --- M Gemfile M Gemfile.lock M Rakefile D tests/browser/ci.yml D tests/browser/environments.yml D tests/browser/features/page_triage.feature D tests/browser/features/step_definitions/page_triage_steps.rb D tests/browser/features/support/env.rb D tests/browser/features/support/pages/page_triage_page.rb 9 files changed, 0 insertions(+), 225 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile b/Gemfile index 591fd6b..14087dc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source 'https://rubygems.org' -gem 'mediawiki_selenium', '~> 1.8' gem 'rake', '~> 11.1', '>= 11.1.1' gem 'rubocop', '~> 0.51.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 1b16d93..1c76c0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,67 +2,6 @@ remote: https://rubygems.org/ specs: ast (2.3.0) - builder (3.2.3) - childprocess (0.6.2) - ffi (~> 1.0, >= 1.0.11) - cucumber (1.3.20) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) - data_magic (1.0) - faker (>= 1.1.2) - yml_reader (>= 0.6) - diff-lcs (1.3) - domain_name (0.5.20170223) - unf (>= 0.0.5, < 1.0.0) - faker (1.7.3) - i18n (~> 0.5) - faraday (0.11.0) - multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) - http-cookie (~> 1.0.0) - faraday_middleware (0.11.0.1) - faraday (>= 0.7.4, < 1.0) - ffi (1.9.17) - gherkin (2.12.2) - multi_json (~> 1.3) - headless (2.3.1) - http-cookie (1.0.3) - domain_name (~> 0.5) - i18n (0.8.1) - json (2.0.3) - mediawiki_api (0.7.1) - faraday (~> 0.9, >= 0.9.0) - faraday-cookie_jar (~> 0.0, >= 0.0.6) - faraday_middleware (~> 0.10, >= 0.10.0) - mediawiki_selenium (1.8.0) - cucumber (~> 1.3, >= 1.3.20) - headless (~> 2.0, >= 2.1.0) - json (~> 2.0, >= 2.0.2) - mediawiki_api (~> 0.7, >= 0.7.0) - page-object (~> 2.0) - rest-client (~> 1.6, >= 1.6.7) - rspec-core (~> 2.14, >= 2.14.4) - rspec-expectations (~> 2.14, >= 2.14.4) - selenium-webdriver (~> 3.1.0) - syntax (~> 1.2, >= 1.2.0) - thor (~> 0.19, >= 0.19.1) - mime-types (2.99.3) - multi_json (1.12.1) - multi_test (0.1.2) - multipart-post (2.0.0) - net-http-persistent (2.9.4) - netrc (0.11.0) - page-object (2.0.0) - net-http-persistent (~> 2.9.4) - page_navigation (>= 0.9) - selenium-webdriver (~> 3.0) - watir (~> 6.0) - page_navigation (0.10) - data_magic (>= 0.22) parallel (1.12.0) parser (2.4.0.2) ast (~> 2.3) @@ -70,13 +9,6 @@ rainbow (2.2.2) rake rake (11.1.1) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec-core (2.99.2) - rspec-expectations (2.99.2) - diff-lcs (>= 1.1.3, < 2.0) rubocop (0.51.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -85,27 +17,12 @@ ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - rubyzip (1.2.1) - selenium-webdriver (3.1.0) - childprocess (~> 0.5) - rubyzip (~> 1.0) - websocket (~> 1.0) - syntax (1.2.1) - thor (0.19.4) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) unicode-display_width (1.3.0) - watir (6.2.0) - selenium-webdriver (~> 3.0) - websocket (1.2.4) - yml_reader (0.7) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium (~> 1.8) rake (~> 11.1, >= 11.1.1) rubocop (~> 0.51.0) diff --git a/Rakefile b/Rakefile index 2877bf6..6eef121 100644 --- a/Rakefile +++ b/Rakefile @@ -8,9 +8,6 @@ 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 deleted file mode 100644 index c2eca93..0000000 --- a/tests/browser/ci.yml +++ /dev/null @@ -1,9 +0,0 @@ -BROWSER: - - chrome - - firefox - -MEDIAWIKI_ENVIRONMENT: - - beta - -PLATFORM: - - Linux diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml deleted file mode 100644 index 8740e5d..0000000 --- a/tests/browser/environments.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Customize this configuration as necessary to provide defaults for various -# test environments. -# -# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT -# environment variable. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# bundle exec cucumber -# -# Additional variables set by the environment will override the corresponding -# defaults defined here. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# export MEDIAWIKI_USER=Selenium_user2 -# bundle exec cucumber -# -mw-vagrant-host: &default - user_factory: true - mediawiki_url: http://127.0.0.1:8080/wiki/ - -mw-vagrant-guest: - user_factory: true - mediawiki_url: http://127.0.0.1/wiki/ - -beta: - mediawiki_url: https://en.wikipedia.beta.wmflabs.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -test2: - mediawiki_url: https://test2.wikipedia.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -integration: - user_factory: true - # mediawiki_url: THIS WILL BE SET BY JENKINS - -default: *default diff --git a/tests/browser/features/page_triage.feature b/tests/browser/features/page_triage.feature deleted file mode 100644 index cf06f71..0000000 --- a/tests/browser/features/page_triage.feature +++ /dev/null @@ -1,18 +0,0 @@ -@chrome @en.wikipedia.beta.wmflabs.org @firefox @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @phantomjs @test2.wikipedia.org -Feature: PageTriage - - @internet_explorer_6 @internet_explorer_7 - Scenario: Check that NewPagesFeed has correct controls for anonymous user - Given I am at the NewPagesFeed page - Then I should see a Learn more link - And I should see a Leave feedback link - And I should see a status icon for a new article - And I should not see a Review button - - # https://phabricator.wikimedia.org/T45598 @internet_explorer_6 @internet_explorer_7 - Scenario: Check set filters selection - Given I am at the NewPagesFeed page - When I click Set filters - Then I should be able to set many checkboxes for filtering new pages - And I should see namespace selectbox - And I should see Username text field diff --git a/tests/browser/features/step_definitions/page_triage_steps.rb b/tests/browser/features/step_definitions/page_triage_steps.rb deleted file mode 100644 index a76ac15..0000000 --- a/tests/browser/features/step_definitions/page_triage_steps.rb +++ /dev/null @@ -1,46 +0,0 @@ -Given(/^I am at the NewPagesFeed page$/) do - visit PageTriagePage -end - -When(/^I click Set filters$/) do - on(PageTriagePage).set_filters_element.when_present.click -end - -Then(/^I should see a Learn more link$/) do - expect(on(PageTriagePage).learn_more_element.when_present).to exist -end - -Then(/^I should be able to set many checkboxes for filtering new pages$/) do - on(PageTriagePage) do |page| - page.select_blocked - page.select_bots - page.check_deletion - page.select_new_editors - page.select_no_categories - page.select_orphan - page.check_redirects - page.check_reviewed_pages - page.check_unreviewed_pages - page.select_user_selected - end -end - -Then(/^I should see a Leave feedback link$/) do - expect(on(PageTriagePage).leave_feedback_element.when_present).to exist -end - -Then(/^I should see a status icon for a new article$/) do - expect(on(PageTriagePage).status_element.when_present).to exist -end - -Then(/^I should not see a Review button$/) do - expect(on(PageTriagePage).review_element).not_to exist -end - -Then(/^I should see namespace selectbox$/) do - expect(on(PageTriagePage).namespace_element).to exist -end - -Then(/^I should see Username text field$/) do - expect(on(PageTriagePage).username_element).to exist -end diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb deleted file mode 100644 index c1072b2..0000000 --- a/tests/browser/features/support/env.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'mediawiki_selenium/cucumber' -require 'mediawiki_selenium/pages' -require 'mediawiki_selenium/step_definitions' diff --git a/tests/browser/features/support/pages/page_triage_page.rb b/tests/browser/features/support/pages/page_triage_page.rb deleted file mode 100644 index 607de8f..0000000 --- a/tests/browser/features/support/pages/page_triage_page.rb +++ /dev/null @@ -1,23 +0,0 @@ -class PageTriagePage - include PageObject - - page_url 'Special:NewPagesFeed' - - radio_button(:blocked, id: 'mwe-pt-filter-blocked') - radio_button(:bots, id: 'mwe-pt-filter-bot-edits') - checkbox(:deletion, id: 'mwe-pt-filter-nominated-for-deletion') - a(:learn_more, href: %r{Wikipedia:Page_Curation/Help}, text: 'Learn more') - a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: 'Leave feedback') - select(:namespace, id: 'mwe-pt-filter-namespace') - radio_button(:new_editors, id: 'mwe-pt-filter-non-autoconfirmed') - radio_button(:no_categories, id: 'mwe-pt-filter-no-categories') - radio_button(:orphan, id: 'mwe-pt-filter-orphan') - checkbox(:redirects, id: 'mwe-pt-filter-redirects') - a(:review, text: 'Review') - checkbox(:reviewed_pages, id: 'mwe-pt-filter-reviewed-edits') - span(:set_filters, id: 'mwe-pt-filter-dropdown-control') - div(:status, class: 'mwe-pt-status-icon') - checkbox(:unreviewed_pages, id: 'mwe-pt-filter-unreviewed-edits') - radio_button(:user_selected, id: 'mwe-pt-filter-user-selected') - text_field(:username, id: 'mwe-pt-filter-user') -end -- To view, visit https://gerrit.wikimedia.org/r/399130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77b060a16a484ef65518d3924a8ee1c3ccaf1f23 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: Mattflaschen <[email protected]> Gerrit-Reviewer: Mooeypoo <[email protected]> Gerrit-Reviewer: Sbisson <[email protected]> Gerrit-Reviewer: Zfilipin <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
