From f497a5683d109281915526e3a40e07940085bbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Mon, 2 Dec 2013 11:38:40 +0200 Subject: [PATCH 1/2] Cleanup of unused tags Change-Id: Idaa483cc59baa795e6e63fcbfd471498a3e4edb8 --- tests/browser/features/autonym.feature | 2 +- tests/browser/features/settings_panel.feature | 1 - tests/browser/features/triggers.feature | 2 -- tests/browser/tags.txt | 5 ----- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/browser/features/autonym.feature b/tests/browser/features/autonym.feature index 34b39b67..a01ea3b1 100644 --- a/tests/browser/features/autonym.feature +++ b/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 diff --git a/tests/browser/features/settings_panel.feature b/tests/browser/features/settings_panel.feature index 21a23a83..22df7f13 100644 --- a/tests/browser/features/settings_panel.feature +++ b/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 diff --git a/tests/browser/features/triggers.feature b/tests/browser/features/triggers.feature index 1e881a50..c9a2834b 100644 --- a/tests/browser/features/triggers.feature +++ b/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 diff --git a/tests/browser/tags.txt b/tests/browser/tags.txt index b6964468..4613725e 100644 --- a/tests/browser/tags.txt +++ b/tests/browser/tags.txt @@ -19,8 +19,3 @@ This file contains the descriptions of the tags we use. 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. From 5749d92c4ffdedc9aa52b2af49daf8bb6f72e834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Mon, 2 Dec 2013 11:46:35 +0200 Subject: [PATCH 2/2] Remove @reset-preferences-after hook Change-Id: I47595f5334fcc7b8fe6d4a7ea69d2b8345f06597 --- tests/browser/features/font_selection.feature | 3 ++- .../features/live_preview_of_display_language.feature | 3 ++- tests/browser/features/persistent_settings.feature | 3 ++- tests/browser/features/settings_panel.feature | 3 ++- tests/browser/features/support/hooks.rb | 4 ---- tests/browser/tags.txt | 5 ----- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/tests/browser/features/font_selection.feature b/tests/browser/features/font_selection.feature index 5ded8af0..6fcbeaae 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 @@ 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 diff --git a/tests/browser/features/live_preview_of_display_language.feature b/tests/browser/features/live_preview_of_display_language.feature index e2fc529b..7bf26553 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 1d1cdfb5..09ab3099 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 22df7f13..5c8e49fd 100644 --- a/tests/browser/features/settings_panel.feature +++ b/tests/browser/features/settings_panel.feature @@ -63,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" diff --git a/tests/browser/features/support/hooks.rb b/tests/browser/features/support/hooks.rb index 192c6933..9f95df74 100644 --- a/tests/browser/features/support/hooks.rb +++ b/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 diff --git a/tests/browser/tags.txt b/tests/browser/tags.txt index 4613725e..413c4818 100644 --- a/tests/browser/tags.txt +++ b/tests/browser/tags.txt @@ -14,8 +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.