Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383934 )
Change subject: Drop beta feature step testing in browser tests
......................................................................
Drop beta feature step testing in browser tests
Page previews is enabled by default on the beta cluster and
in master.
In production config we enable it for all wikis but enwiki
and dewiki.
We should thus stop testing this to bring our testing in line with
reality.
This allows our browser tests to run against the beta cluster as
well as per commit as well as reduces the amount of code we need to
port to Node.js
Additional changes:
* Remove redundant support pages and properties
Bug: T177924
Change-Id: Ia85e7b60774232ced35641f2671462ca0ef64f18
---
M tests/browser/LocalSettings.php
M tests/browser/features/previews.feature
M tests/browser/features/support/pages/article_page.rb
D tests/browser/features/support/pages/special_preferences_page.rb
M tests/browser/features/support/step_definitions/common_steps.rb
5 files changed, 1 insertion(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/34/383934/1
diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index 9fc344e..f00b0f4 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -1,4 +1,3 @@
<?php
-$wgPopupsBetaFeature = true;
$wgUsejQueryThree = false;
diff --git a/tests/browser/features/previews.feature
b/tests/browser/features/previews.feature
index d0f781c..c6f40c3 100644
--- a/tests/browser/features/previews.feature
+++ b/tests/browser/features/previews.feature
@@ -1,9 +1,7 @@
@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @test2.m.wikipedia.org
@vagrant @integration
Feature: Previews
Background:
- Given I am logged in
- And I have enabled the beta feature
- And I am on the test page
+ Given I am on the test page
Scenario: Dwelling on a valid link shows a preview
When I dwell on the first valid link
diff --git a/tests/browser/features/support/pages/article_page.rb
b/tests/browser/features/support/pages/article_page.rb
index da213ad..c27d6c8 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -8,11 +8,4 @@
div(:page_header, css: '#mw-head')
a(:first_valid_link, css: 'ul a', index: 0)
div(:hovercard, css: '.mwe-popups')
- a(:settings_icon, css: '.mwe-popups-settings-icon')
- radio(:enable_previews_radio, id: 'mwe-popups-settings-simple')
- radio(:disable_previews_radio, id: 'mwe-popups-settings-off')
- div(:cancel_settings_button, css: '#mwe-popups-settings .close', index: 0)
- button(:save_settings_button, css: '#mwe-popups-settings .save')
- button(:settings_help_ok_button, css: '#mwe-popups-settings .okay', index: 0)
- a(:last_link_in_the_footer, css: '#footer-places a', index: -1)
end
diff --git a/tests/browser/features/support/pages/special_preferences_page.rb
b/tests/browser/features/support/pages/special_preferences_page.rb
deleted file mode 100644
index fddf93a..0000000
--- a/tests/browser/features/support/pages/special_preferences_page.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class SpecialPreferencesPage
- include PageObject
- page_url 'Special:Preferences'
-
- a(:beta_features_tab, css: '#preftab-betafeatures')
- text_field(:page_previews_checkbox, css: '[name=wppopups]')
- button(:submit_button, css: '#prefcontrol')
- div(:notification, css: ".mw-notification")
-
- def enable_page_previews
- beta_features_tab_element.when_present.click
- return unless page_previews_checkbox_element.attribute('checked').nil?
- page_previews_checkbox_element.click
- submit_button_element.when_present.click
-
- # Note well that Element#wait_until_present is more semantic but is
- # deprecated. Fortunately, #when_present simply wraps #wait_until_present.
- notification_element.when_present
- end
-end
diff --git a/tests/browser/features/support/step_definitions/common_steps.rb
b/tests/browser/features/support/step_definitions/common_steps.rb
index f2b8fee..8e9a42a 100644
--- a/tests/browser/features/support/step_definitions/common_steps.rb
+++ b/tests/browser/features/support/step_definitions/common_steps.rb
@@ -1,9 +1,5 @@
TEST_PAGE_TITLE = 'Popups test page'
-Given(/^I have enabled the beta feature$/) do
- visit(SpecialPreferencesPage).enable_page_previews
-end
-
Given(/^I am on the test page$/) do
api.create_page TEST_PAGE_TITLE, File.read('fixtures/test_page.wikitext')
--
To view, visit https://gerrit.wikimedia.org/r/383934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia85e7b60774232ced35641f2671462ca0ef64f18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
