From 8ad57f9b0e58475189ac092f588c34d0e526da09 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Tue, 29 May 2018 10:15:24 +0100
Subject: [PATCH] QA: Stabilise browser tests

Changes:
* Default skin is not configured so noticed on test runs it's using
Default skin for desktop mode. Given this has no footer and way to
switch to mobile this could be problematic in future.
* Remove empty README
* Drop suggested language integration test - setting up interwiki links currently
happens via InterwikiLoadPrefix hook however this seems to be unreliable. The beta
cluster is a much more reliable place to test language links so let's rely on that
instead.
* Drop unnecessary heading check from "Successful edit" scenario. It's unnecessary
and flakey (presumably given the title doesn't change)
* Rename test scenario and remove a duplicate scenario

Depends-On: I888b3c546f77fa350853a7bf9bfbfbeb8ed6de67
Change-Id: I45792a95df7fd4c3299accbffadfa447baefe0ce
---
 tests/browser/LocalSettings.php                  |  4 ++++
 tests/browser/README.txt                         |  1 -
 .../features/editor_wikitext_saving.feature      | 16 ++--------------
 tests/browser/features/language.feature          |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 tests/browser/README.txt

diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index 1ce72ea..40a8734 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -21,6 +21,10 @@ $wgInterwikiCache = false;
 
 $wgMFEnableBeta = true;
 
+// Set the desktop skin to MinervaNeue. Otherwise, it will try to guess the skin name using the
+// class name MinervaNeue which resolves to `minervaneue`.
+$wgDefaultSkin = 'minerva';
+
 // needed for testing whether the language button is displayed and disabled
 $wgMinervaAlwaysShowLanguageButton = true;
 
diff --git a/tests/browser/README.txt b/tests/browser/README.txt
deleted file mode 100644
index 563d823..0000000
--- a/tests/browser/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Coming soon...!
diff --git a/tests/browser/features/editor_wikitext_saving.feature b/tests/browser/features/editor_wikitext_saving.feature
index 07b9517..d8fdc71 100644
--- a/tests/browser/features/editor_wikitext_saving.feature
+++ b/tests/browser/features/editor_wikitext_saving.feature
@@ -4,20 +4,8 @@ Feature: Wikitext Editor (Makes actual saves)
   Background:
     Given I am logged into the mobile website
 
-  @smoke @editing @integration
-  Scenario: Successful edit on page without languages shows no language button [bug 63675]
-    Given the page "Selenium no languages test page" exists
-    When I click the edit button
-      And I see the wikitext editor overlay
-      And I type "ABC GHI" into the editor
-      And I click continue
-      And I click submit
-      And I do not see the wikitext editor overlay
-    Then I should see a toast notification
-      And the text of the first heading should be "Selenium no languages test page"
-
-  @editing
-  Scenario: Successful edit reloads language button
+  @editing @integration
+  Scenario: It is possible to edit
     Given I go to a page that has languages
     When I click the edit button
       And I see the wikitext editor overlay
diff --git a/tests/browser/features/language.feature b/tests/browser/features/language.feature
index d85d30e..67aa36e 100644
--- a/tests/browser/features/language.feature
+++ b/tests/browser/features/language.feature
@@ -56,7 +56,7 @@ Feature: Language selection
     Then I should not see a suggested language link
     Then I should see a non-suggested language link
 
-  @smoke @en.m.wikipedia.beta.wmflabs.org @integration
+  @smoke @en.m.wikipedia.beta.wmflabs.org
   Scenario: Checking that the suggested language link has been created
     Given I go to a page that has languages
     And I click the switch-language page action