From e8be6b3111a6728eaf76a1cb7fd5c825a877c73a Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 30 Oct 2012 11:33:21 -0400
Subject: [PATCH] Get jasmine tests running on cms

---
 cms/envs/common.py  | 11 +----------
 cms/envs/jasmine.py |  4 ++++
 lms/envs/common.py  |  3 ---
 lms/envs/jasmine.py |  4 ++++
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index b04c423732..f110ede87a 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -68,9 +68,7 @@ MAKO_TEMPLATES['main'] = [
 for namespace, template_dirs in lms.envs.common.MAKO_TEMPLATES.iteritems():
     MAKO_TEMPLATES['lms.' + namespace] = template_dirs
 
-TEMPLATE_DIRS = (
-    PROJECT_ROOT / "templates",
-)
+TEMPLATE_DIRS = MAKO_TEMPLATES['main']
 
 MITX_ROOT_URL = ''
 
@@ -88,10 +86,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
 
 LMS_BASE = None
 
-################################# Jasmine ###################################
-JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
-
-
 #################### CAPA External Code Evaluation #############################
 XQUEUE_INTERFACE = {
     'url': 'http://localhost:8888',
@@ -289,7 +283,4 @@ INSTALLED_APPS = (
     # For asset pipelining
     'pipeline',
     'staticfiles',
-
-    # For testing
-    'django_jasmine',
 )
diff --git a/cms/envs/jasmine.py b/cms/envs/jasmine.py
index f85edc59a0..b42744a520 100644
--- a/cms/envs/jasmine.py
+++ b/cms/envs/jasmine.py
@@ -28,4 +28,8 @@ PIPELINE_JS['spec'] = {
     'output_filename': 'js/cms-spec.js'
 }
 
+JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
+
 STATICFILES_DIRS.append(COMMON_ROOT / 'test' / 'phantom-jasmine' / 'lib')
+
+INSTALLED_APPS += ('django_jasmine', )
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 6889181713..251427d014 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -537,9 +537,6 @@ INSTALLED_APPS = (
     'wiki.plugins.notifications',
     'course_wiki.plugins.markdownedx',
 
-    # For testing
-    'django_jasmine',
-
     # Discussion
     'django_comment_client',
 
diff --git a/lms/envs/jasmine.py b/lms/envs/jasmine.py
index e90fd2e101..43459f79aa 100644
--- a/lms/envs/jasmine.py
+++ b/lms/envs/jasmine.py
@@ -28,4 +28,8 @@ PIPELINE_JS['spec'] = {
     'output_filename': 'js/lms-spec.js'
 }
 
+JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
+
 STATICFILES_DIRS.append(COMMON_ROOT / 'test' / 'phantom-jasmine' / 'lib')
+
+INSTALLED_APPS += ('django_jasmine', )