diff --git a/.travis.yml b/.travis.yml index 14aeb429..8079c4d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,10 @@ language: c sudo: false -addons: - # 2.x Selenium WebDriver only works for Firefox <= 47.0.1 - firefox: "47.0.1" - env: global: - CONDA_DEPS="numpy pytest" - - PIP_DEPS="'selenium<3' pyimgur" + - PIP_DEPS="selenium pyimgur" matrix: include: @@ -31,8 +27,9 @@ install: - eval pip install "$PIP_DEPS" before_script: - - wget http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar - - java -jar selenium-server-standalone-2.53.1.jar > /dev/null & + - wget https://github.com/mozilla/geckodriver/releases/download/v0.11.1/geckodriver-v0.11.1-linux64.tar.gz + - tar -xvzf geckodriver-*.tar.gz + - export PATH="$(pwd):$PATH" - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sleep 3 # give xvfb and some time to start diff --git a/nengo_gui/conftest.py b/nengo_gui/conftest.py index 01b0ff45..a08265a1 100644 --- a/nengo_gui/conftest.py +++ b/nengo_gui/conftest.py @@ -42,7 +42,7 @@ def gui(): @pytest.yield_fixture(scope="session") def driver(gui): driver = webdriver.Firefox() - driver.get('localhost:{port}/'.format(port=gui.server.server_port)) + driver.get('http://localhost:{port}/'.format(port=gui.server.server_port)) driver.maximize_window() assert driver.title != "Problem loading page"