Merge branch 'phantomjs-tests'

.travis.yml

@@ -9,10 +9,11 @@ before_install:
 - export PIP_USE_MIRRORS=true
 - export PIP_INDEX_URL=https://simple.crate.io/
 - phantomjs --version
+- phantomjs --webdriver= &
 install:
 - pip install https://github.com/stefanw/terrarium/archive/develop.zip boto
 - terrarium key requirements-test.txt
-- terrarium --target froideenv --remote-key-format "u/stwe/froideenv/%(arch)s-%(python_vmajor)s.%(python_vminor)s-%(digest)s" install requirements-test.txt || (wget "http://resources.opendatalabs.org.s3.amazonaws.com/u/stwe/froideenv/`terrarium key requirements-test.txt`" ; terrarium --no-upload --s3-bucket "" --target froideenv --storage-dir . install requirements-test.txt)
+- terrarium --virtualenv-log-level 20 --pip-log-level 20 --target froideenv --remote-key-format "u/stwe/froideenv/%(arch)s-%(python_vmajor)s.%(python_vminor)s-%(digest)s" install requirements-test.txt || (wget "http://resources.opendatalabs.org.s3.amazonaws.com/u/stwe/froideenv/`terrarium key requirements-test.txt`" ; terrarium --pip-log-level 20 --virtualenv-log-level 20 --no-upload --s3-bucket "" --target froideenv --storage-dir . install requirements-test.txt)
 - source froideenv/bin/activate
 - which python
 - pip install -e .

Makefile

@@ -1,14 +1,6 @@
 export DJANGO_SETTINGS_MODULE=froide.test_settings
 
 test:
-	pep8 --ignore=E501,E124,E126,E127,E128 --exclude=migrations froide
-	coverage run --branch --source=froide `which django-admin.py` test froide.account.tests froide.foirequest.tests froide.foirequestfollower.tests froide.frontpage.tests froide.publicbody.tests
-	coverage report --omit="*/migrations/*"
-
-testall:
 	pep8 --ignore=E501,E124,E126,E127,E128 --exclude=migrations froide
 	coverage run --branch --source=froide `which django-admin.py` test froide
 	coverage report --omit="*/migrations/*"
-
-live:
-	coverage run --branch --source=froide `which django-admin.py` test froide.tests.live

froide/test_settings.py

@@ -247,6 +247,7 @@
 
 TEST_RUNNER = 'discover_runner.DiscoverRunner'
 
+TEST_SELENIUM_DRIVER = 'phantomjs'
 # south settings
 
 SOUTH_TESTS_MIGRATE = False

froide/tests/live/test_request.py

@@ -1,22 +1,35 @@
 import time
 
+from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.test import LiveServerTestCase
 from django.contrib.auth.models import User
 
-from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.support.wait import WebDriverWait
 
 from froide.foirequest.tests import factories
 from froide.foirequest.models import FoiRequest
 from froide.publicbody.models import PublicBody
 
 
+def get_selenium():
+    driver = getattr(settings, 'TEST_SELENIUM_DRIVER', 'firefox')
+    if driver == 'firefox':
+        from selenium.webdriver.firefox.webdriver import WebDriver as FirefoxDriver
+        return FirefoxDriver()
+    elif driver == 'chrome':
+        from selenium.webdriver.chrome.webdriver import WebDriver as ChromeDriver
+        return ChromeDriver()
+    elif driver == 'phantomjs':
+        from selenium.webdriver import PhantomJS
+        return PhantomJS()
+
+
 class TestMakingRequest(LiveServerTestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.selenium = WebDriver()
+        cls.selenium = get_selenium()
         cls.selenium.implicitly_wait(5)
         super(TestMakingRequest, cls).setUpClass()
 

requirements-test.txt

@@ -1,4 +1,4 @@
 -r requirements.txt
 django-discover-runner==0.2.2
 pyelasticsearch==0.2
-selenium==2.25.0
+selenium==2.29.0