From c8bba3c15ff69df70aa1b74637b5b7890abbf8f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Arranz?= <aarranz@ficodes.com>
Date: Sun, 15 Jul 2018 15:08:21 +0200
Subject: [PATCH] Upgrade selenium

---
 .travis.yml                                   |  7 ++++++-
 .../privatedatasets/tests/test_selenium.py    | 20 ++++++++-----------
 setup.py                                      |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62f7f11..5ab0865 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,12 @@ services:
     - redis-server
     - postgresql
 addons:
-    firefox: "46.0"
+    firefox: "60.1.0esr"
+before_install:
+    - wget https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz
+    - mkdir geckodriver
+    - tar -xzf geckodriver-v0.21.0-linux64.tar.gz -C geckodriver
+    - export PATH=$PATH:$PWD/geckodriver
 install:
     - bash bin/travis-build.bash
 before_script:
diff --git a/ckanext/privatedatasets/tests/test_selenium.py b/ckanext/privatedatasets/tests/test_selenium.py
index 8b8effb..c2923a8 100644
--- a/ckanext/privatedatasets/tests/test_selenium.py
+++ b/ckanext/privatedatasets/tests/test_selenium.py
@@ -34,8 +34,8 @@ import requests
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support.ui import Select, WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select, WebDriverWait
 
 import ckanext.privatedatasets.db as db
 
@@ -48,13 +48,20 @@ class TestSelenium(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
+        # Run CKAN
         env = os.environ.copy()
         env['DEBUG'] = 'False'
         cls._process = Popen(['paster', 'serve', 'test.ini'], env=env)
 
+        # Init Selenium
+        cls.driver = webdriver.Firefox()
+        cls.base_url = 'http://localhost:5000/'
+        cls.driver.set_window_size(1024, 768)
+
     @classmethod
     def tearDownClass(cls):
         cls._process.terminate()
+        #cls.driver.quit()
 
     def clearBBDD(self):
         # Clean Solr
@@ -73,19 +80,8 @@ class TestSelenium(unittest.TestCase):
     def setUp(self):
         self.clearBBDD()
 
-        if 'WEB_DRIVER_URL' in os.environ and 'CKAN_SERVER_URL' in os.environ:
-            self.driver = webdriver.Remote(os.environ['WEB_DRIVER_URL'], webdriver.DesiredCapabilities.FIREFOX.copy())
-            self.base_url = os.environ['CKAN_SERVER_URL']
-        else:
-
-            self.driver = webdriver.Firefox()
-            self.base_url = 'http://localhost:5000/'
-
-        self.driver.set_window_size(1024, 768)
-
     def tearDown(self):
         self.clearBBDD()
-        self.driver.quit()
 
     def assert_fields_disabled(self, fields):
         for field in fields:
diff --git a/setup.py b/setup.py
index 436dc2c..138dbc3 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ setup(
     ],
     tests_require=[
         'parameterized',
-        'selenium==2.52.0'
+        'selenium==3.13.0'
     ],
     test_suite='nosetests',
     entry_points='''