Upgrade selenium
This commit is contained in:
parent
56401296d3
commit
c8bba3c15f
|
@ -9,7 +9,12 @@ services:
|
||||||
- redis-server
|
- redis-server
|
||||||
- postgresql
|
- postgresql
|
||||||
addons:
|
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:
|
install:
|
||||||
- bash bin/travis-build.bash
|
- bash bin/travis-build.bash
|
||||||
before_script:
|
before_script:
|
||||||
|
|
|
@ -34,8 +34,8 @@ import requests
|
||||||
from selenium import webdriver
|
from selenium import webdriver
|
||||||
from selenium.webdriver.common.by import By
|
from selenium.webdriver.common.by import By
|
||||||
from selenium.webdriver.common.keys import Keys
|
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 import expected_conditions as EC
|
||||||
|
from selenium.webdriver.support.ui import Select, WebDriverWait
|
||||||
|
|
||||||
import ckanext.privatedatasets.db as db
|
import ckanext.privatedatasets.db as db
|
||||||
|
|
||||||
|
@ -48,13 +48,20 @@ class TestSelenium(unittest.TestCase):
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def setUpClass(cls):
|
def setUpClass(cls):
|
||||||
|
# Run CKAN
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
env['DEBUG'] = 'False'
|
env['DEBUG'] = 'False'
|
||||||
cls._process = Popen(['paster', 'serve', 'test.ini'], env=env)
|
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
|
@classmethod
|
||||||
def tearDownClass(cls):
|
def tearDownClass(cls):
|
||||||
cls._process.terminate()
|
cls._process.terminate()
|
||||||
|
#cls.driver.quit()
|
||||||
|
|
||||||
def clearBBDD(self):
|
def clearBBDD(self):
|
||||||
# Clean Solr
|
# Clean Solr
|
||||||
|
@ -73,19 +80,8 @@ class TestSelenium(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.clearBBDD()
|
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):
|
def tearDown(self):
|
||||||
self.clearBBDD()
|
self.clearBBDD()
|
||||||
self.driver.quit()
|
|
||||||
|
|
||||||
def assert_fields_disabled(self, fields):
|
def assert_fields_disabled(self, fields):
|
||||||
for field in fields:
|
for field in fields:
|
||||||
|
|
Loading…
Reference in New Issue