Merge branch 'test-fix' into dev

.travis.yml

@@ -31,3 +31,7 @@ matrix:
       env: DJANGO=1.8.3
     - python: 2.6
       env: DJANGO=1.9.8
+    - python: 3.2
+      env: DJANGO=1.9.8
+    - python: 3.3
+      env: DJANGO=1.9.8

jet/templatetags/jet_tags.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+import django
 from django import template
 from django.core.urlresolvers import reverse
 from django.db.models import OneToOneField
@@ -57,7 +58,10 @@ class FormatBreadcrumbsNode(template.Node):
         items = filter(None, items)
 
         t = loader.get_template('admin/breadcrumbs.html')
-        c = Context({'items': items})
+        c = {'items': items}
+
+        if django.VERSION[:2] < (1, 9):
+            c = Context(c)
 
         return t.render(c)
 

jet/tests/admin.py

@@ -1,8 +1,13 @@
 from django.contrib import admin
-from jet.tests.models import TestModel
+from jet.tests.models import TestModel, RelatedToTestModel
 
 
 class TestModelAdmin(admin.ModelAdmin):
     list_display = ('field1', 'field2')
 
+
+class RelatedToTestModelAdmin(admin.ModelAdmin):
+    pass
+
 admin.site.register(TestModel, TestModelAdmin)
+admin.site.register(RelatedToTestModel, RelatedToTestModelAdmin)

jet/tests/settings.py

@@ -1,5 +1,9 @@
+import os
+import django
 from django.conf import global_settings
 
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
 SECRET_KEY = '!DJANGO_JET_TESTS!'
 
 DEBUG = True
@@ -28,9 +32,23 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = tuple(global_settings.TEMPLATE_CONTEXT_PROCESSORS) + (
-    'django.core.context_processors.request',
-)
+if django.VERSION[:2] < (1, 9):
+    TEMPLATE_CONTEXT_PROCESSORS = tuple(global_settings.TEMPLATE_CONTEXT_PROCESSORS) + (
+        'django.core.context_processors.request',
+    )
+else:
+    TEMPLATES = [
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'DIRS': [os.path.join(BASE_DIR, 'templates')],
+            'APP_DIRS': True,
+            'OPTIONS': {
+                'context_processors': tuple(global_settings.TEMPLATE_CONTEXT_PROCESSORS) + (
+                    'django.template.context_processors.request',
+                )
+            },
+        },
+    ]
 
 DATABASES = {
     'default': {

jet/tests/test_filters.py

@@ -18,14 +18,11 @@ class FiltersTestCase(TestCase):
         self.models.append(TestModel.objects.create(field1='second', field2=2))
 
     def get_related_field_ajax_list_filter_params(self):
-        class ModelAdmin(admin.ModelAdmin):
-            pass
-
         model = RelatedToTestModel
         field_path = 'field'
         field = get_fields_from_path(model, field_path)[-1]
         lookup_params = {}
-        model_admin = ModelAdmin
+        model_admin = admin.site._registry.get(model)
 
         return field, lookup_params, model, model_admin, field_path