From a56a3aad7e190365656d98048668b798fa6edec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Mali=C5=84ski?= Date: Tue, 7 Jul 2015 19:54:53 +0200 Subject: [PATCH] Use StaticLiveServerTestCase for selenium tests under Django 1.7+. --- ckeditor_demo/demo_application/tests.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ckeditor_demo/demo_application/tests.py b/ckeditor_demo/demo_application/tests.py index 9a21889..dd1ee7e 100644 --- a/ckeditor_demo/demo_application/tests.py +++ b/ckeditor_demo/demo_application/tests.py @@ -9,18 +9,13 @@ SELENIUM_BROWSER = FIREFOX from django.conf import settings from django.contrib.staticfiles.finders import find -from django.test import LiveServerTestCase +from django.contrib.staticfiles.testing import StaticLiveServerTestCase from django.test.utils import override_settings -if SELENIUM_BROWSER == CHROMIUM: - from selenium import webdriver -elif SELENIUM_BROWSER == FIREFOX: - from selenium.webdriver.firefox.webdriver import WebDriver -else: - raise ValueError('a browser must be picked to run selenium tests') +from selenium import webdriver -class TestAdminPanelWidget(LiveServerTestCase): +class TestAdminPanelWidget(StaticLiveServerTestCase): fixtures = ['test_admin.json'] @classmethod @@ -28,7 +23,7 @@ class TestAdminPanelWidget(LiveServerTestCase): if SELENIUM_BROWSER == CHROMIUM: cls.selenium = webdriver.Chrome(executable_path='/usr/lib/chromium-browser/chromedriver') elif SELENIUM_BROWSER == FIREFOX: - cls.selenium = WebDriver() + cls.selenium = webdriver.Firefox() super(TestAdminPanelWidget, cls).setUpClass() @classmethod