Merge changes I47595f53,Idaa483cc

* changes:
  Remove @reset-preferences-after hook
  Cleanup of unused tags

tests/browser/features/autonym.feature

@@ -27,7 +27,7 @@ Feature: Autonym font
     Then the Interlanguage links should use Autonym font
       And elements that are not Interlanguage links should not use Autonym font
 
-  @anon-language-selection @commons.wikimedia.beta.wmflabs.org
+  @commons.wikimedia.beta.wmflabs.org
   Scenario: Autonym font is used in the ULS language search dialog for input language selection by anonymous users
     Given I am at random page
       And I open the Universal Language Selector

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 @@ Feature: Font selection
 
   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

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
 

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

tests/browser/features/settings_panel.feature

@@ -51,7 +51,6 @@ Feature: Settings panel
       And I open "Language" panel of language settings
       Then the panel is in English
 
-  @no-anon-language-selection
   Scenario: The name of site content language is correct when translation language is different
 
     This feature is a bit hard to test. In most cases content language matches
@@ -64,10 +63,11 @@ Feature: Settings panel
     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"

tests/browser/features/support/hooks.rb

@@ -2,7 +2,3 @@ Before("@language") do |scenario|
   @language = true
   @scenario = scenario
 end
-
-After("@reset-preferences-after") do |scenario|
-  visit(ResetPreferencesPage).submit_element.click if @browser.exist?
-end

tests/browser/features/triggers.feature

@@ -6,7 +6,6 @@ Feature: Trigger in personal toolbar
     When I click language selector trigger element
     Then I should see the language selector
 
-  @no-anon-language-selection
   Scenario: Open language settings when logged out and language change not allowed
 
     If the user is logged out, the user will either see the language selector
@@ -17,7 +16,6 @@ Feature: Trigger in personal toolbar
     When I click language selector trigger element
     Then I see the logged in language settings panel
 
-  @anon-language-selection
   Scenario: Open language selector when logged out
 
     Given I am at random page

tests/browser/tags.txt

@@ -14,13 +14,3 @@ This file contains the descriptions of the tags we use.
 @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.
-
-@anon-language-selection
-@no-anon-language-selection
-  Depending on the wiki configuration, you should filter out either one of
-  these tests.