Yet more fixes to get unit tests to work with latest ICEkit

ic-labs · Nov 24, 2016 · ec6c525 · ec6c525
1 parent 914cc1e
commit ec6c525
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/icekit_events/templates/base.html b/icekit_events/templates/base.html
diff --git a/icekit_events/tests/settings.py b/icekit_events/tests/settings.py
@@ -34,15 +34,19 @@
     'django_nose',
     'fluent_pages',
     'fluent_contents',
-    'icekit',
+
     'icekit_events',
     'icekit_events.event_types.simple',
     'icekit_events.page_types.eventlistingfordate',
     'icekit_events.tests',
+
+    # ICEkit modules must be loaded *after* events to avoid import errors
+    'icekit',
+    'icekit.workflow',
+    'icekit.publishing',
     'icekit.plugins.image',
 
     # Apps required for publishing features
-    'icekit.publishing',
     'model_settings',
     'polymorphic',
     'compressor',
@@ -69,4 +73,18 @@
 DDF_FILL_NULLABLE_FIELDS = False
 FLUENT_PAGES_TEMPLATE_DIR = os.path.join(BASE_DIR, '..', 'templates')
 
-TEMPLATE_CONTEXT_PROCESSORS = ['django.core.context_processors.request']
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'DIRS': [
+            os.path.join('icekit_events', 'tests', 'templates'),
+            os.path.join('icekit_events', 'templates'),
+        ],
+        'OPTIONS': {
+            'context_processors': [
+                'django.core.context_processors.request',
+            ],
+        },
+    },
+]
diff --git a/icekit_events/tests/templates/base.html b/icekit_events/tests/templates/base.html
@@ -0,0 +1,10 @@
+{# ONLY FOR RUNNING TESTS INDEPENDENTLY OF ICEKIT #}
+<html>
+	<head>
+	</head>
+	<body>
+		{% block title %}{% endblock %}
+		{% block content %}{% endblock %}
+		{% block body_js %}{% endblock %}
+	</body>
+</html>