Wagtail 2.0 compatibility

cfpb · May 14, 2018 · 1decc3b · 1decc3b
1 parent f2a2d6b
commit 1decc3b
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 29 deletions.
diff --git a/treemodeladmin/tests/settings.py b/treemodeladmin/tests/settings.py
@@ -4,6 +4,8 @@
 
 import django
 
+import wagtail
+
 
 DEBUG = True
 
@@ -19,7 +21,7 @@
             'DATABASE_ENGINE',
             'django.db.backends.sqlite3'
         ),
-        'NAME': os.environ.get('DATABASE_NAME', 'wagtailsharing.sqlite'),
+        'NAME': os.environ.get('DATABASE_NAME', 'treemodeladmin.sqlite'),
         'USER': os.environ.get('DATABASE_USER', None),
         'PASSWORD': os.environ.get('DATABASE_PASS', None),
         'HOST': os.environ.get('DATABASE_HOST', None),
@@ -30,17 +32,68 @@
     },
 }
 
+if wagtail.VERSION >= (2, 0):
+    WAGTAIL_APPS = (
+        'wagtail.contrib.forms',
+        'wagtail.contrib.modeladmin',
+        'wagtail.contrib.settings',
+        'wagtail.tests.testapp',
+        'wagtail.admin',
+        'wagtail.core',
+        'wagtail.documents',
+        'wagtail.images',
+        'wagtail.sites',
+        'wagtail.users',
+    )
+
+    WAGTAIL_MIDDLEWARE = (
+        'wagtail.core.middleware.SiteMiddleware',
+    )
+
+    WAGTAILADMIN_RICH_TEXT_EDITORS = {
+        'default': {
+            'WIDGET': 'wagtail.admin.rich_text.DraftailRichTextArea'
+        },
+        'custom': {
+            'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea'
+        },
+    }
+else:
+    WAGTAIL_APPS = (
+        'wagtail.contrib.modeladmin',
+        'wagtail.contrib.settings',
+        'wagtail.tests.testapp',
+        'wagtail.wagtailadmin',
+        'wagtail.wagtailcore',
+        'wagtail.wagtaildocs',
+        'wagtail.wagtailforms',
+        'wagtail.wagtailimages',
+        'wagtail.wagtailsites',
+        'wagtail.wagtailusers',
+    )
+
+    WAGTAIL_MIDDLEWARE = (
+        'wagtail.wagtailcore.middleware.SiteMiddleware',
+    )
+
+    WAGTAILADMIN_RICH_TEXT_EDITORS = {
+        'default': {
+            'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea',
+        },
+        'custom': {
+            'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea'
+        },
+    }
+
 if django.VERSION >= (1, 10):
     MIDDLEWARE = (
         'django.middleware.common.CommonMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.middleware.csrf.CsrfViewMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
         'django.middleware.clickjacking.XFrameOptionsMiddleware',
-        'wagtail.wagtailcore.middleware.SiteMiddleware',
-    )
+    ) + WAGTAIL_MIDDLEWARE
 else:
     MIDDLEWARE_CLASSES = (
         'django.middleware.common.CommonMiddleware',
@@ -50,29 +103,16 @@
         'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
         'django.middleware.clickjacking.XFrameOptionsMiddleware',
-        'wagtail.wagtailcore.middleware.SiteMiddleware',
-    )
+    ) + WAGTAIL_MIDDLEWARE
 
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.staticfiles',
-
     'taggit',
-
-    'wagtail.contrib.modeladmin',
-    'wagtail.contrib.settings',
-    'wagtail.tests.testapp',
-    'wagtail.wagtailadmin',
-    'wagtail.wagtailcore',
-    'wagtail.wagtaildocs',
-    'wagtail.wagtailforms',
-    'wagtail.wagtailimages',
-    'wagtail.wagtailsites',
-    'wagtail.wagtailusers',
-
+) + WAGTAIL_APPS + (
     'treemodeladmin',
     'treemodeladmin.tests.treemodeladmintest',
 )
@@ -98,12 +138,3 @@
 ]
 
 WAGTAIL_SITE_NAME = 'Test Site'
-
-WAGTAILADMIN_RICH_TEXT_EDITORS = {
-    'default': {
-        'WIDGET': 'wagtail.wagtailadmin.rich_text.HalloRichTextArea'
-    },
-    'custom': {
-        'WIDGET': 'wagtail.tests.testapp.rich_text.CustomRichTextArea'
-    },
-}
diff --git a/treemodeladmin/tests/urls.py b/treemodeladmin/tests/urls.py
@@ -1,6 +1,10 @@
 from django.conf.urls import include, url
 
-from wagtail.wagtailadmin import urls as wagtailadmin_urls
+
+try:
+    from wagtail.admin import urls as wagtailadmin_urls
+except ImportError:
+    from wagtail.wagtailadmin import urls as wagtailadmin_urls
 
 
 urlpatterns = [