Merge branch 'test-fix' into dev

jet/tests/__init__.py

@@ -1,4 +0,0 @@
-from jet.tests.test_dashboard import DashboardTestCase
-from jet.tests.test_utils import UtilsTestCase
-from jet.tests.test_views import ViewsTestCase
-from jet.tests.test_filters import FiltersTestCase

jet/tests/test_dashboard.py

@@ -1,3 +1,4 @@
+from django.contrib.auth.models import User
 from django.test import TestCase, Client
 from jet.dashboard.modules import LinkList, RecentActions
 from jet.dashboard.models import UserDashboardModule
@@ -13,17 +14,12 @@ class DashboardTestCase(TestCase):
         self._login()
         self._init_dashboard()
 
-    @property
-    def User(self):
-        from django.contrib.auth.models import User
-        return User
-
     def _login(self):
         username = 'admin'
         email = 'admin@example.com'
         password = 'admin'
         self.admin = Client()
-        self.admin_user = self.User.objects.create_superuser(username, email, password)
+        self.admin_user = User.objects.create_superuser(username, email, password)
         return self.admin.login(username=username, password=password)
 
     def _init_dashboard(self):

jet/tests/urls.py

@@ -1,12 +1,15 @@
+import django
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^jet/', include('jet.urls', 'jet')),
     url(r'^jet/dashboard/', include('jet.dashboard.urls', 'jet-dashboard')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),
-)
+]
+
+if django.VERSION[:2] < (1, 8):
+    urlpatterns = patterns('', *urlpatterns)