Upgrade selenium

docs/tests.rst

@@ -283,6 +283,26 @@ version of OSX and a OSX version of XVFB. You can find more details
    share, please do!
 
 
+Troubleshooting
+---------------
+
+**It says "Selenium unavailable."**
+
+    This could mean that Selenium couldn't launch Firefox or can
+    launch it, but can't connect to it.
+
+    Selenium by default looks for Firefox in "the usual places".
+    You can explicitly tell it which Firefox binary to use with
+    the ``SELENIUM_FIREFOX_PATH`` setting.
+
+    For example, in your ``settings_local.py`` file::
+
+        SELENIUM_FIREFOX_PATH = '/usr/bin/firefox'
+
+    I do this to make sure I'm using Firefox stable for tests
+    rather than Firefox nightly.
+
+
 .. _tests-chapter-qa-test-suite:
 
 The QA test suite

kitsune/sumo/tests/__init__.py

@@ -13,6 +13,7 @@
 from nose.tools import eq_
 from selenium import webdriver
 from selenium.common.exceptions import WebDriverException
+from selenium.webdriver.firefox import firefox_binary
 from test_utils import TestCase as OriginalTestCase
 
 from kitsune import sumo
@@ -133,7 +134,14 @@ class SeleniumTestCase(LiveServerTestCase):
     @classmethod
     def setUpClass(cls):
         try:
-            cls.webdriver = webdriver.Firefox()
+            firefox_path = getattr(settings, 'SELENIUM_FIREFOX_PATH', None)
+            if firefox_path:
+                firefox_bin = firefox_binary.FirefoxBinary(
+                    firefox_path=firefox_path)
+                kwargs = {'firefox_binary': firefox_bin}
+            else:
+                kwargs = {}
+            cls.webdriver = webdriver.Firefox(**kwargs)
         except (RuntimeError, WebDriverException):
             cls.skipme = True
 

vendor/packages/selenium/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: selenium
-Version: 2.33.0
+Version: 2.35.0
 Summary: Python bindings for Selenium
 Home-page: http://code.google.com/p/selenium/
 Author: UNKNOWN
@@ -35,10 +35,10 @@ Description: ============
         Java Server
         -----------
 
-        Download the server from http://selenium.googlecode.com/files/selenium-server-standalone-2.33.0.jar
+        Download the server from http://selenium.googlecode.com/files/selenium-server-standalone-2.35.0.jar
         ::
 
-            java -jar selenium-server-standalone-2.33.0.jar
+            java -jar selenium-server-standalone-2.35.0.jar
 
         Example
         =======