aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Barrois <raphael.barrois@polytechnique.org>2014-09-03 23:49:47 +0200
committerRaphaël Barrois <raphael.barrois@polytechnique.org>2014-09-03 23:49:47 +0200
commit25bd44c30007d5babecefed651827431569ee1ee (patch)
tree784a3c8a26dd0567e9904f8f751516414c730a4f
parent5e4edb44daf54a4c34703319bdb9467ca7b3de8d (diff)
downloadfactory-boy-25bd44c30007d5babecefed651827431569ee1ee.tar
factory-boy-25bd44c30007d5babecefed651827431569ee1ee.tar.gz
Fix support for Django 1.7.
-rw-r--r--tests/djapp/settings.py1
-rw-r--r--tests/test_django.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/djapp/settings.py b/tests/djapp/settings.py
index c1b79b0..c051faf 100644
--- a/tests/djapp/settings.py
+++ b/tests/djapp/settings.py
@@ -41,5 +41,6 @@ INSTALLED_APPS = [
'tests.djapp'
]
+MIDDLEWARE_CLASSES = ()
SECRET_KEY = 'testing.'
diff --git a/tests/test_django.py b/tests/test_django.py
index 95e0256..874c272 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -61,6 +61,8 @@ if django is not None:
else:
django_test = unittest
+if django is not None and django.VERSION >= (1, 7, 0):
+ django.setup()
test_state = {}