Merge "Changed Cucumber tags according to the convention"

tests/browser/config/cucumber.yml

@@ -1,2 +0,0 @@
-# WMF Jenkins/Gerrit
-ciwmf: -t ~@needs-custom-setup -t ~@phantomjs-bug

tests/browser/features/accept_language.feature

@@ -1,4 +1,4 @@
-@custom-browser @sandbox.translatewiki.net
+@custom-browser @firefox @internet_explorer_10 @phantomjs @sandbox.translatewiki.net
 Feature: Accept-Language
 
   Scenario Outline: Accept-Language

tests/browser/features/autonym.feature

@@ -1,3 +1,4 @@
+@firefox @internet_explorer_10 @phantomjs
 Feature: Autonym font
 
   * With tofu detection in ULS, system fonts will be given preference over webfonts.

tests/browser/features/font_selection_default_disabled.feature

@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org @login @needs-custom-setup
+@commons.wikimedia.beta.wmflabs.org @firefox @internet_explorer_10 @login @phantomjs
 Feature: Font selection
 
   In order to have better using experience,

tests/browser/features/font_selection_default_enabled.feature

@@ -1,4 +1,4 @@
-@language-browsertests.wmflabs.org @login @needs-custom-setup
+@firefox @internet_explorer_10 @language-browsertests.wmflabs.org @login @phantomjs
 Feature: Font selection
 
   In order to have better using experience,

tests/browser/features/ime.feature

@@ -1,3 +1,4 @@
+@firefox @phantomjs
 Feature: Input method engine
 
 User is able to select among different input methods via a menu which is
@@ -5,7 +6,7 @@ activated by the input method indicator. User can type with selected input
 method in different input fields and temporarily activate and deactivate the
 input method.
 
-  @commons.wikimedia.beta.wmflabs.org
+  @clean @commons.wikimedia.beta.wmflabs.org @internet_explorer_10
   Scenario: Input method indicator is shown
 
   The input method indicator is shown when input field gets a focus.
@@ -14,7 +15,7 @@ input method.
     When I click on an input box
     Then I should see the input method indicator
 
-  @commons.wikimedia.beta.wmflabs.org @needs-custom-setup
+  @commons.wikimedia.beta.wmflabs.org @internet_explorer_10
   Scenario: Input method menu
 
   Input method menu is shown when user clicks the input method indicator.
@@ -26,7 +27,7 @@ input method.
       And I should see a list of available input methods
       And I should see a list of suggested languages
 
-  @needs-custom-setup
+  @internet_explorer_10
   Scenario: Unsupported input language
 
   User visits a wiki with content language that does not have have an input
@@ -36,7 +37,7 @@ input method.
     When I open the input method menu
     Then I should see input methods for Kotava
 
-  @needs-custom-setup @commons.wikimedia.beta.wmflabs.org
+  @commons.wikimedia.beta.wmflabs.org
   Scenario: Sticky input methods
 
   Chosen input method selection persists across page loads.
@@ -53,7 +54,7 @@ input method.
     Then I should see the input method indicator
       And in it there must be an element with Malayalam text
 
-  @commons.wikimedia.beta.wmflabs.org
+  @clean @commons.wikimedia.beta.wmflabs.org @internet_explorer_10
   Scenario Outline: Input method menu is completely visible
     Given I visit a random page with <skin> skin and <language> as the interface language
     When I open the input method menu

tests/browser/features/live_preview_of_display_language.feature

@@ -1,4 +1,4 @@
-@login
+@firefox @internet_explorer_10 @login @phantomjs
 Feature: Live preview of display language changes
 
   Background:
@@ -6,7 +6,7 @@ Feature: Live preview of display language changes
       And I have reset my preferences
       And I am at the main page
 
-  @needs-custom-setup @commons.wikimedia.beta.wmflabs.org
+  @commons.wikimedia.beta.wmflabs.org
   Scenario: Display language change is previewed immediately
     Given I open the Universal Language Selector
       And I open Display panel of language settings
@@ -15,7 +15,7 @@ Feature: Live preview of display language changes
       And I click on the link to select Malayalam
     Then I should see the text in the language panel in Malayalam
 
-  @commons.wikimedia.beta.wmflabs.org
+  @clean @commons.wikimedia.beta.wmflabs.org
   Scenario: Live preview of display language changes can be reverted on cancel
     Given I open the Universal Language Selector
       And I open Display panel of language settings
@@ -24,7 +24,7 @@ Feature: Live preview of display language changes
       And I open Display panel of language settings
     Then I should see the text in the language panel in English
 
-  @commons.wikimedia.beta.wmflabs.org
+  @clean @commons.wikimedia.beta.wmflabs.org
   Scenario: Live preview of display language changes can be reverted on closing the dialog with the X button
     Given I open the Universal Language Selector
       And I open Display panel of language settings
@@ -34,7 +34,7 @@ Feature: Live preview of display language changes
     Then I should see the text in the language panel in English
 
   # https://bugzilla.wikimedia.org/57967
-  # @commons.wikimedia.beta.wmflabs.org
+  # @clean @commons.wikimedia.beta.wmflabs.org
   Scenario: Live preview of display language changes can be reverted on closing the dialog on cancel from a different panel
     Given I open the Universal Language Selector
       And I open Display panel of language settings

tests/browser/features/persistent_settings.feature

@@ -1,5 +1,5 @@
 # First scenario seems to fail whenever OpenDyslexic is missing
-@language-browsertests.wmflabs.org @login @needs-custom-setup
+@firefox @internet_explorer_10 @language-browsertests.wmflabs.org @login @phantomjs
 Feature: Persistent settings
 
   This assumes wiki content language is English.

tests/browser/features/settings_panel.feature

@@ -1,3 +1,4 @@
+@firefox @internet_explorer_10 @phantomjs
 Feature: Settings panel
 
   @login @ime-default-on
@@ -32,10 +33,10 @@ Feature: Settings panel
       And I see Language Search
       And I can navigate back to Input Settings
 
-  @login
+   @login
   Scenario: More languages (interface language selection)
     Given I am logged in
-    When I open "Language" panel of language settings
+    When I open Language panel of language settings
       And I click the button with the ellipsis
     Then I see Common Languages
       And I see Worldwide
@@ -46,12 +47,12 @@ Feature: Settings panel
   Scenario: Temporary live preview for menu language
 
     Given I am logged in
-    When I open "Language" panel of language settings
+    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"
       And I switch to Input panel of language settings
       And I click X
-      And I open "Language" panel of language settings
+      And I open Language panel of language settings
       Then the panel is in English
 
   Scenario: The name of site content language is correct when translation language is different
@@ -63,7 +64,7 @@ Feature: Settings panel
     interface language to a non-default value.
 
     Given I temporarily use "Finnish" as the interface language
-    When I open "Language" panel of language settings
+    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
@@ -71,7 +72,7 @@ Feature: Settings panel
 
     Given I am logged in
       And I have reset my preferences
-    When I open "Language" panel of language settings
+    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"
       And I apply the changes

tests/browser/features/textarea_font.feature

@@ -1,4 +1,4 @@
-@login
+@firefox @internet_explorer_10 @login @phantomjs
 Feature: Font preferences respected in different languages
 
   If a user has an edit font preferences respect that preference.
@@ -11,6 +11,7 @@ Feature: Font preferences respected in different languages
     Given I am logged in
       And I have reset my preferences
 
+  @clean
   Scenario: Edit area fonts should not change on UI language change if the user preferences for edit area font are set
     When I set the editing fonts to "monospace"
       And I set "Hindi" as the interface language
@@ -18,31 +19,29 @@ Feature: Font preferences respected in different languages
     Then I should see the edit area text being displayed using "monospace" font
 
   # Needs OpenDyslexic font to have been configured on the target wiki
-  @needs-custom-setup
   Scenario: Edit area should use the fonts selected by the user from ULS for a language
     When I select OpenDyslexic font for the content language
       And I start editing a page
     Then I should see the edit area text being displayed using "OpenDyslexic" font
 
   Scenario: Edit area should use the ULS selected fonts when content language has a ULS font selection
-    When I open "Language" panel of language settings
+    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"
-      And I open "Fonts" panel of language settings
+      And I open Fonts panel of language settings
       And I select "OpenDyslexic" font for the content language for the live preview
       And I apply the changes
       And I start editing a page
     Then I should see the edit area text being displayed using "OpenDyslexic" font
 
   Scenario: Edit area should use the system default fonts when content language does not have any ULS font selection
-    When I open "Language" panel of language settings
+    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"
       And I apply the changes
       And I start editing a page
     Then I should see the edit area text being displayed using "monospace" font
 
-  @phantomjs-bug
   Scenario: Edit area should use browser's default Monospace font for languages that have a default monospace font (Latin, Cyrillic, Hebrew etc.)
     When I start editing a page
     Then I should see the edit area text being displayed using "monospace" font

tests/browser/features/triggers.feature

@@ -1,4 +1,4 @@
-@needs-custom-setup
+@firefox @internet_explorer_10 @phantomjs
 Feature: Trigger in personal toolbar
 
   @commons.wikimedia.beta.wmflabs.org @login