fixes tests

saxix · Jan 3, 2014 · 3876985 · 3876985
1 parent 6e84527
commit 3876985
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/conftest.py b/conftest.py
@@ -10,6 +10,14 @@ def pytest_configure(config):
     if not settings.configured:
         os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
 
+    try:
+        from django.apps import AppConfig
+        import django
+
+        django.setup()
+    except ImportError:
+        pass
+
 
 def runtests(args=None):
     import pytest

diff --git a/tests/functional/test_merge.py b/tests/functional/test_merge.py
@@ -33,6 +33,7 @@ def test_success(self):
 
         url = reverse('admin:auth_user_changelist')
         test_file = os.path.join(os.path.dirname(__file__), 'casper-tests/merge.js')
+        assert os.path.exists(test_file)
         self.assertTrue(self.casper(test_file,
                                     url=url,
                                     ids=ids,