Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98489
Change subject: Remove @reset-preferences-after hook
......................................................................
Remove @reset-preferences-after hook
Change-Id: I47595f5334fcc7b8fe6d4a7ea69d2b8345f06597
---
M tests/browser/features/font_selection.feature
M tests/browser/features/live_preview_of_display_language.feature
M tests/browser/features/persistent_settings.feature
M tests/browser/features/settings_panel.feature
M tests/browser/features/support/hooks.rb
M tests/browser/tags.txt
6 files changed, 8 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/89/98489/1
diff --git a/tests/browser/features/font_selection.feature
b/tests/browser/features/font_selection.feature
index 5ded8af..6fcbeaa 100644
--- a/tests/browser/features/font_selection.feature
+++ b/tests/browser/features/font_selection.feature
@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org @login @reset-preferences-after
+@commons.wikimedia.beta.wmflabs.org @login
Feature: Font selection
In order to have better using experience,
@@ -11,6 +11,7 @@
Background:
Given I am logged in
+ And I have reset my preferences
And I set "German" as the interface language
And I open ULS
And I open Display panel of language settings
diff --git a/tests/browser/features/live_preview_of_display_language.feature
b/tests/browser/features/live_preview_of_display_language.feature
index e2fc529..7bf2655 100644
--- a/tests/browser/features/live_preview_of_display_language.feature
+++ b/tests/browser/features/live_preview_of_display_language.feature
@@ -1,8 +1,9 @@
-@login @reset-preferences-after
+@login
Feature: Live preview of display language changes
Background:
Given I am logged in
+ And I have reset my preferences
And I set "English" as the interface language
And I am on a page with interlanguage links
diff --git a/tests/browser/features/persistent_settings.feature
b/tests/browser/features/persistent_settings.feature
index 1d1cdfb..09ab309 100644
--- a/tests/browser/features/persistent_settings.feature
+++ b/tests/browser/features/persistent_settings.feature
@@ -1,10 +1,11 @@
-@commons.wikimedia.beta.wmflabs.org @login @reset-preferences-after
+@commons.wikimedia.beta.wmflabs.org @login
Feature: Persistent settings
This assumes wiki content language is English.
Background:
Given I am logged in
+ And I have reset my preferences
And I set "German" as the interface language
And I open the Universal Language Selector
And I open Display panel of language settings
diff --git a/tests/browser/features/settings_panel.feature
b/tests/browser/features/settings_panel.feature
index 22df7f1..5c8e49f 100644
--- a/tests/browser/features/settings_panel.feature
+++ b/tests/browser/features/settings_panel.feature
@@ -63,10 +63,11 @@
When I open "Language" panel of language settings
Then I see "English (sama kuin sisällön)" as the name of the content
language
- @login @reset-preferences-after
+ @login
Scenario: Selecting language via [...] button
Given I am logged in
+ And I have reset my preferences
When I open "Language" panel of language settings
And I click the button with the ellipsis
And I use the panel to change my interface language to "German"
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
index 192c693..9f95df7 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -2,7 +2,3 @@
@language = true
@scenario = scenario
end
-
-After("@reset-preferences-after") do |scenario|
- visit(ResetPreferencesPage).submit_element.click if @browser.exist?
-end
diff --git a/tests/browser/tags.txt b/tests/browser/tags.txt
index 4613725..413c481 100644
--- a/tests/browser/tags.txt
+++ b/tests/browser/tags.txt
@@ -14,8 +14,3 @@
@login
This test logs in. You can filter these tests out if you don't have an
account available.
-
-@reset-preferences-after
- This test changes user preferences and resets them at the end. In theory you
- could use your normal user account if you skip these tests, but I would not
- recommend doing that.
--
To view, visit https://gerrit.wikimedia.org/r/98489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47595f5334fcc7b8fe6d4a7ea69d2b8345f06597
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
