From f055f8d7899d270292491ac5f4dd7d27db602327 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Thu, 29 Nov 2018 16:40:02 -0800
Subject: [PATCH] Drop toast tests from beta cluster

Given the fade in/out animation of the toasts and the instability of
the beta cluster and the round trips to Sauce labs, we're seeing lots
of false positives on our browser test reports

Running these per commit should ensure we see minimal regressions and
get some protection. We'll continue to test other scenarios which do not involve
the toast on beta cluster.

Provided we can rely on green browser tests, we will trust the browser
tests more and they will be more useful than they currently are.

Bug: T208808
Change-Id: Idc601ad462de36f2d6d52fe951194b429e6f824f
---
 tests/browser/features/editor_wikitext_saving.feature | 6 +++---
 tests/browser/features/pageactions_protected.feature  | 2 +-
 tests/browser/features/watchstar.feature              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/browser/features/editor_wikitext_saving.feature b/tests/browser/features/editor_wikitext_saving.feature
index 7ac4f8e..36a5a53 100644
--- a/tests/browser/features/editor_wikitext_saving.feature
+++ b/tests/browser/features/editor_wikitext_saving.feature
@@ -1,4 +1,4 @@
-@en.m.wikipedia.beta.wmflabs.org @test2.m.wikipedia.org @login
+@test2.m.wikipedia.org @login
 Feature: Wikitext Editor (Makes actual saves)
 
   Background:
@@ -15,7 +15,7 @@ Feature: Wikitext Editor (Makes actual saves)
       And I do not see the wikitext editor overlay
     Then I should see a toast notification
 
-  @editing
+  @editing @en.m.wikipedia.beta.wmflabs.org
   Scenario: Redirects
     Given the page "Selenium wikitext editor test" exists
       And I am on a page that does not exist
@@ -28,7 +28,7 @@ Feature: Wikitext Editor (Makes actual saves)
       And I do not see the wikitext editor overlay
     Then the text of the first heading should be "Selenium wikitext editor test"
 
-  @editing
+  @editing @en.m.wikipedia.beta.wmflabs.org
   Scenario: Broken redirects
     Given I am on a page that does not exist
     When I click the edit button
diff --git a/tests/browser/features/pageactions_protected.feature b/tests/browser/features/pageactions_protected.feature
index f44c4dd..c152e4d 100644
--- a/tests/browser/features/pageactions_protected.feature
+++ b/tests/browser/features/pageactions_protected.feature
@@ -1,4 +1,4 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @adminuser
+@chrome @integration @adminuser
 Feature: Page actions menu when anonymous
 
   Background:
diff --git a/tests/browser/features/watchstar.feature b/tests/browser/features/watchstar.feature
index c54e9e0..e90e010 100644
--- a/tests/browser/features/watchstar.feature
+++ b/tests/browser/features/watchstar.feature
@@ -1,4 +1,4 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @integration @smoke @test2.m.wikipedia.org @login @vagrant
+@chrome @integration @smoke @test2.m.wikipedia.org @login @vagrant
 Feature: Manage Watchlist
 
   Background: