WMDE-Fisch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346513 )

Change subject: Remove browser tests for beta feature setting
......................................................................

Remove browser tests for beta feature setting

The browser tests do not gain very much from the beta
feature tests and the default setting having the extension
only availible as a beta feature slows down the tests in
general.

Furthermore removing this will make it easier to let tests
pass for the temporary change in the slider logic.

Change-Id: I7377a6f11aa103af76d14fea3cbb34572495192a
---
M extension.json
M tests/browser/features/autoexpand.feature
D tests/browser/features/betafeature.feature
M tests/browser/features/difflinks.feature
M tests/browser/features/expand.feature
M tests/browser/features/help.feature
M tests/browser/features/history.feature
M tests/browser/features/pointers.feature
D tests/browser/features/support/pages/special_preferences_page.rb
M tests/browser/features/support/step_definitions/common_steps.rb
M tests/browser/features/timeline.feature
M tests/browser/features/tooltips.feature
12 files changed, 8 insertions(+), 80 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/13/346513/1

diff --git a/extension.json b/extension.json
index 57ce856..db7170d 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,7 @@
        },
        "config": {
                "@RevisionSliderBetaFeature": "Make the RevisionSlider feature 
a BetaFeature. Setting this requires the RevisionSlider extension and requires 
each user to enable the BetaFeature.",
-               "RevisionSliderBetaFeature": true
+               "RevisionSliderBetaFeature": false
        },
        "MessagesDirs": {
                "RevisionSlider": [
diff --git a/tests/browser/features/autoexpand.feature 
b/tests/browser/features/autoexpand.feature
index cf0a57f..681ee7b 100644
--- a/tests/browser/features/autoexpand.feature
+++ b/tests/browser/features/autoexpand.feature
@@ -1,10 +1,7 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider auto expand
   Background:
-    Given I am logged in
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
-    And a page with 2 revision(s) exists
+    Given a page with 2 revision(s) exists
 
   Scenario: Revision slider does not automatically expand by default
     Given I am on the diff page
diff --git a/tests/browser/features/betafeature.feature 
b/tests/browser/features/betafeature.feature
deleted file mode 100644
index cee6bf5..0000000
--- a/tests/browser/features/betafeature.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
-Feature: RevisionSlider betafeature
-  Background:
-    Given I am logged in
-    And a page with 2 revision(s) exists
-
-  Scenario: RevisionSlider is not loaded when feature disabled
-    Given RevisionSlider is disabled as a beta feature
-    And I am on the diff page
-    Then There should not be a RevisionSlider expand button
-
-  Scenario: RevisionSlider is loaded when feature enabled
-    Given RevisionSlider is enabled as a beta feature
-    And I am on the diff page
-    Then There should be a RevisionSlider expand button
\ No newline at end of file
diff --git a/tests/browser/features/difflinks.feature 
b/tests/browser/features/difflinks.feature
index d8b8385..8adfb83 100644
--- a/tests/browser/features/difflinks.feature
+++ b/tests/browser/features/difflinks.feature
@@ -1,10 +1,7 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider diff links
   Background:
-    Given I am logged in
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
-    And a page with 4 revision(s) exists
+    Given a page with 4 revision(s) exists
 
   Scenario: Older edit diff link can be clicked
     Given I am on the diff page
diff --git a/tests/browser/features/expand.feature 
b/tests/browser/features/expand.feature
index 6d3876d..b3308f5 100644
--- a/tests/browser/features/expand.feature
+++ b/tests/browser/features/expand.feature
@@ -1,10 +1,7 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider expand
   Background:
-    Given I am logged in
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
-    And a page with 2 revision(s) exists
+    Given a page with 2 revision(s) exists
 
   Scenario: RevisionSlider is collapsed initially
     Given I am on the diff page
diff --git a/tests/browser/features/help.feature 
b/tests/browser/features/help.feature
index 69ca1a7..3846617 100644
--- a/tests/browser/features/help.feature
+++ b/tests/browser/features/help.feature
@@ -1,10 +1,7 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider help
   Background:
-    Given I am logged in
-    And a page with 2 revision(s) exists
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
+    Given a page with 2 revision(s) exists
     And I am on the diff page
 
   Scenario: RevisionSlider tutorial is present on first load
diff --git a/tests/browser/features/history.feature 
b/tests/browser/features/history.feature
index 389e0b4..51e20b5 100644
--- a/tests/browser/features/history.feature
+++ b/tests/browser/features/history.feature
@@ -1,10 +1,7 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider history
   Background:
-    Given I am logged in
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
-    And a page with 4 revision(s) exists
+    Given a page with 4 revision(s) exists
 
   Scenario: RevisionSlider history can be accessed using browser back and 
forward buttons after clicking on a revision
     Given I am on the diff page
diff --git a/tests/browser/features/pointers.feature 
b/tests/browser/features/pointers.feature
index 4cf45fd..7a1bbb5 100644
--- a/tests/browser/features/pointers.feature
+++ b/tests/browser/features/pointers.feature
@@ -1,10 +1,7 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider pointers
   Background:
-    Given I am logged in
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
-    And a page with 5 revision(s) exists
+    Given a page with 5 revision(s) exists
 
   Scenario: RevisionSlider pointers move when revision bars are clicked
     Given I am on the diff page
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 44faee5..0000000
--- a/tests/browser/features/support/pages/special_preferences_page.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class SpecialPreferencesPage
-  include PageObject
-  page_url 'Special:Preferences'
-
-  link(:beta_features_tab, css: '#preftab-betafeatures')
-  checkbox(:revisionslider_checkbox, name: 'wprevisionslider')
-  span(:revisionslider_checkbox_div, xpath: 
'//*[@name="wprevisionslider"]//parent::span')
-  button(:submit_button, css: '#prefcontrol')
-
-  def enable_revisionslider
-    beta_features_tab_element.when_visible.click
-    return if revisionslider_checkbox_checked?
-    revisionslider_checkbox_div_element.click
-    submit_button_element.when_visible.click
-  end
-
-  def disable_revisionslider
-    beta_features_tab_element.when_visible.click
-    return unless revisionslider_checkbox_checked?
-    revisionslider_checkbox_div_element.click
-    submit_button_element.when_visible.click
-  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 2bf595b..67f77f7 100644
--- a/tests/browser/features/support/step_definitions/common_steps.rb
+++ b/tests/browser/features/support/step_definitions/common_steps.rb
@@ -52,14 +52,6 @@
   on(DiffPage).wait_for_ajax_calls
 end
 
-Then(/^RevisionSlider is enabled as a beta feature$/) do
-  visit(SpecialPreferencesPage).enable_revisionslider
-end
-
-Then(/^RevisionSlider is disabled as a beta feature$/) do
-  visit(SpecialPreferencesPage).disable_revisionslider
-end
-
 Then(/^The auto expand button should be off/) do
   expect(on(DiffPage).revisionslider_auto_expand_button_element.class_name).to 
match 'oo-ui-toggleWidget-off'
 end
diff --git a/tests/browser/features/timeline.feature 
b/tests/browser/features/timeline.feature
index 16f8f9a..a1f0c6b 100644
--- a/tests/browser/features/timeline.feature
+++ b/tests/browser/features/timeline.feature
@@ -1,10 +1,5 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider timeline
-  Background:
-    Given I am logged in
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
-
   Scenario: RevisionSlider timeline arrows to be disabled with 3 revisions
     Given a page with 3 revision(s) exists
     And I am on the diff page
diff --git a/tests/browser/features/tooltips.feature 
b/tests/browser/features/tooltips.feature
index b35e394..359eea6 100644
--- a/tests/browser/features/tooltips.feature
+++ b/tests/browser/features/tooltips.feature
@@ -1,10 +1,7 @@
 @chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
 Feature: RevisionSlider tooltips
   Background:
-    Given I am logged in
-    And I have reset my preferences
-    And RevisionSlider is enabled as a beta feature
-    And a page with 4 revision(s) exists
+    Given a page with 4 revision(s) exists
 
   Scenario: RevisionSlider revision tooltip appears on hover
     Given I am on the diff page

-- 
To view, visit https://gerrit.wikimedia.org/r/346513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7377a6f11aa103af76d14fea3cbb34572495192a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to