From 6d2447ca74933dce8895023f1787e93d14d34ecc Mon Sep 17 00:00:00 2001
From: Jhall <jhall@wikimedia.org>
Date: Fri, 7 Feb 2014 01:51:38 +0000
Subject: [PATCH] Revert "[Browser test] Reintroduce headless browser test
 support"

This reverts commit 8e8525dea9c0a37f9cff19d3ce5c7ed80595dd63.

This change seems to have broken all of the VisualEditor browser tests, similar to our first attempt at solving the same problem - not good :(

Change-Id: I5fa70a1164ebe8de1ecc37f72ba7ceffdc31e7bd
---
 modules/ve-mw/test/browser/Gemfile.lock       | 28 +++++++++----------
 .../test/browser/features/support/hooks.rb    |  4 +++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/modules/ve-mw/test/browser/Gemfile.lock b/modules/ve-mw/test/browser/Gemfile.lock
index bd8573b073..52f4dba2a0 100644
--- a/modules/ve-mw/test/browser/Gemfile.lock
+++ b/modules/ve-mw/test/browser/Gemfile.lock
@@ -19,31 +19,29 @@ GEM
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    headless (1.0.1)
     i18n (0.6.9)
     json (1.8.1)
-    mediawiki-selenium (0.1.20)
-      cucumber (~> 1.3.10)
-      headless (~> 1.0.1)
-      json (~> 1.8.1)
-      net-http-persistent (~> 2.9.1)
-      page-object (~> 0.9.5)
-      rest-client (~> 1.6.7)
-      rspec-expectations (~> 2.14.4)
-      syntax (~> 1.2.0)
+    mediawiki-selenium (0.1.17)
+      cucumber
+      json
+      net-http-persistent
+      page-object
+      rest-client
+      rspec-expectations
+      syntax
     mime-types (2.1)
     multi_json (1.8.4)
     multi_test (0.0.3)
-    net-http-persistent (2.9.2)
-    page-object (0.9.6)
+    net-http-persistent (2.9.1)
+    page-object (0.9.5)
       page_navigation (>= 0.9)
       selenium-webdriver (>= 2.39.0)
-      watir-webdriver (>= 0.6.7)
+      watir-webdriver (>= 0.6.4)
     page_navigation (0.9)
       data_magic (>= 0.14)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-expectations (2.14.5)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rubyzip (1.1.0)
     selenium-webdriver (2.39.0)
@@ -52,7 +50,7 @@ GEM
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
     syntax (1.2.0)
-    watir-webdriver (0.6.7)
+    watir-webdriver (0.6.4)
       selenium-webdriver (>= 2.18.0)
     websocket (1.0.7)
     yml_reader (0.2)
diff --git a/modules/ve-mw/test/browser/features/support/hooks.rb b/modules/ve-mw/test/browser/features/support/hooks.rb
index b898bac6dd..95912bd2c5 100644
--- a/modules/ve-mw/test/browser/features/support/hooks.rb
+++ b/modules/ve-mw/test/browser/features/support/hooks.rb
@@ -1,3 +1,7 @@
+at_exit do
+  $browser.close unless ENV["KEEP_BROWSER_OPEN"] == "true"
+end
+
 #This is for the Headings test
 Before("@edit_user_page") do
   if (!$edit_user_page or !(ENV["REUSE_BROWSER"] == "true")) and @browser