From b71bb0cc8c4c6c73406ca38cd815dc9fba60ecee Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Tue, 27 Nov 2018 17:45:28 -0800
Subject: [PATCH] QA: Tagging changes from beta cluster

* features/search_loggedin.feature
They run on integration and are not super-business-critical.
Given their flakiness and Cirrus's likelihood of being down,
don't run it on beta cluster
* tests/browser/features/language.feature
Tag is superfulous, all scenarios repeat it.
* tests/browser/features/toggling.feature
ocassionally fails on firefox. Limit to Chrome and integration
tests
* tests/browser/features/search.feature
Limit the tests that run against beta cluster to search for
partial text and clicking a search result, since these are
two things we want to check integration well with other extensions.
The rest being testing on the more stable @integration tests
should be more than enough.

Change-Id: Ia2e8d3726212fee30725fdb9167ea38aa41eacbf
---
 tests/browser/features/language.feature        | 2 +-
 tests/browser/features/search.feature          | 6 +++---
 tests/browser/features/search_loggedin.feature | 2 +-
 tests/browser/features/toggling.feature        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/browser/features/language.feature b/tests/browser/features/language.feature
index 323c30f..5ed257b 100644
--- a/tests/browser/features/language.feature
+++ b/tests/browser/features/language.feature
@@ -1,4 +1,4 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org
+@chrome @test2.m.wikipedia.org
 Feature: Language selection
 
   Background:
diff --git a/tests/browser/features/search.feature b/tests/browser/features/search.feature
index b2df021..9980c23 100644
--- a/tests/browser/features/search.feature
+++ b/tests/browser/features/search.feature
@@ -1,4 +1,4 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @integration @test2.m.wikipedia.org @vagrant
+@chrome @firefox @integration @test2.m.wikipedia.org @vagrant
 Feature: Search
 
   Background:
@@ -17,7 +17,7 @@ Feature: Search
     When I click the browser back button
     Then I should not see the search overlay
 
-  @smoke @integration
+  @smoke @integration @en.m.wikipedia.beta.wmflabs.org
   Scenario: Search for partial text
     When I type into search box "Selenium search tes"
     Then search results should contain "Selenium search test"
@@ -39,7 +39,7 @@ Feature: Search
     When I click the browser back button
     Then I should not see '#/search' in URL
 
-  @integration
+  @integration @en.m.wikipedia.beta.wmflabs.org
   Scenario: Search doesn't break after one search result
     When I type into search box "Selenium search tes"
     And I click a search result
diff --git a/tests/browser/features/search_loggedin.feature b/tests/browser/features/search_loggedin.feature
index 2294162..159d1d1 100644
--- a/tests/browser/features/search_loggedin.feature
+++ b/tests/browser/features/search_loggedin.feature
@@ -1,4 +1,4 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @integration @test2.m.wikipedia.org @vagrant @login
+@integration @test2.m.wikipedia.org @vagrant @login
 Feature: Search
 
   Scenario: Clicking on a watchstar toggles the watchstar
diff --git a/tests/browser/features/toggling.feature b/tests/browser/features/toggling.feature
index 0ffc2a3..fc1131c 100644
--- a/tests/browser/features/toggling.feature
+++ b/tests/browser/features/toggling.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @firefox @test2.m.wikipedia.org @vagrant
+@en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org @vagrant
 Feature: Toggling sections
 
   Background: