The latest version of splinter no longer supports phantomjs, use the …

…default firefox driver instead.
GeoNode · Mar 20, 2019 · 4b651df · 4b651df
1 parent a4974af
commit 4b651df
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/geonode/tests/bdd/e2e/conftest.py b/geonode/tests/bdd/e2e/conftest.py
@@ -39,12 +39,11 @@
 @pytest.yield_fixture(scope='function', autouse=True)
 def en_browser(browser, bdd_server):
     """Browser login page from live server."""
-    browser = Browser('phantomjs')
+    browser = Browser()
     en_browser = browser
     en_browser.visit(urljoin(bdd_server.url, '/account/login/'))
     yield en_browser
     try:
-        # kill the specific phantomjs child proc
         en_browser.service.process.send_signal(signal.SIGTERM)
     except BaseException:
         pass

diff --git a/pytest.ini b/pytest.ini
@@ -4,4 +4,3 @@ python_classes = *Test
 python_functions = test_*
 pep8maxlinelength = 79
 testpaths = geonode/tests/bdd/e2e/
-addopts = --splinter-webdriver=phantomjs
diff --git a/requirements.txt b/requirements.txt
@@ -131,6 +131,7 @@ flake8==3.7.7
 pytest==4.3.1
 pytest-bdd==3.1.0
 splinter==0.10.0
+pytest-splinter==2.0.1
 pytest-django==3.4.8
 setuptools==40.8.0
 Twisted==18.9.0
diff --git a/scripts/misc/bdd_setup.sh b/scripts/misc/bdd_setup.sh