From acb0051bcda40fd4f4f2977445cd0f8afe03fe6b Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Mon, 26 Mar 2018 11:24:25 -0700
Subject: [PATCH] QA: Speed up browser tests by not unnecessarily opting into
 beta

We only need to opt into beta to test the beta indicator displays.
There is no need to do this anywhere else in our browser tests.

For the categories test we will enable the feature flag in test mode
and not run it against the beta cluster.

Bug: T174018
Change-Id: I83b5f24236cef6ddd6fc1882bdfff3618a8bf599
---
 tests/browser/LocalSettings.php                | 2 ++
 tests/browser/features/category.feature        | 3 +--
 tests/browser/features/search.feature          | 1 -
 tests/browser/features/search_loggedin.feature | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index 6826133..1ce72ea 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -33,3 +33,5 @@ $wgMFDisplayWikibaseDescriptions = [
 	'watchlist' => true,
 	'tagline' => true,
 ];
+
+$wgMinervaShowCategoriesButton['base'] = true;
diff --git a/tests/browser/features/category.feature b/tests/browser/features/category.feature
index 090ab6d..0dc33e6 100644
--- a/tests/browser/features/category.feature
+++ b/tests/browser/features/category.feature
@@ -1,10 +1,9 @@
-@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @test2.m.wikipedia.org @vagrant @login
+@chrome @firefox @test2.m.wikipedia.org @vagrant @login
 Feature: Categories
 
   Scenario: I can view categories
     Given I am in a wiki that has categories
       And I am using the mobile site
-      And I am in beta mode
       And I am on the "Selenium categories test page" page
     When I click on the category button
     Then I should see the categories overlay
diff --git a/tests/browser/features/search.feature b/tests/browser/features/search.feature
index 1f0a69c..b2df021 100644
--- a/tests/browser/features/search.feature
+++ b/tests/browser/features/search.feature
@@ -3,7 +3,6 @@ Feature: Search
 
   Background:
     Given I am using the mobile site
-      And I am in beta mode
       And the page "Selenium search test" exists
       And I am on the "Main Page" page
       And I am viewing the site in mobile mode
diff --git a/tests/browser/features/search_loggedin.feature b/tests/browser/features/search_loggedin.feature
index 291fe8e..e15c474 100644
--- a/tests/browser/features/search_loggedin.feature
+++ b/tests/browser/features/search_loggedin.feature
@@ -3,7 +3,6 @@ Feature: Search
 
   Scenario: Clicking on a watchstar toggles the watchstar
     Given I am using the mobile site
-      And I am in beta mode
       And the page "Selenium search test" exists
       And I am logged into the mobile website
       And I am on the "Main Page" page