From 6b94090e673ab80723de67d3d95be819714ede44 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Wed, 6 Mar 2013 17:41:44 -0500
Subject: [PATCH] Fixed jasmine test issue with cms caused by previous change
 to order of file import.  Introduced static_files list in files.json
 (supported in original django_jasmine implementation) that loads static files
 before any compiled files.

---
 cms/static/coffee/files.json       | 18 +++++++++---------
 common/templates/jasmine/base.html |  4 ++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/cms/static/coffee/files.json b/cms/static/coffee/files.json
index 2249813b04..e7a66b5bc0 100644
--- a/cms/static/coffee/files.json
+++ b/cms/static/coffee/files.json
@@ -1,12 +1,12 @@
 {
-  "js_files": [
-    "/static/js/vendor/RequireJS.js",
-    "/static/js/vendor/jquery.min.js",
-    "/static/js/vendor/jquery-ui.min.js",
-    "/static/js/vendor/jquery.ui.draggable.js",
-    "/static/js/vendor/jquery.cookie.js",
-    "/static/js/vendor/json2.js",
-    "/static/js/vendor/underscore-min.js",
-    "/static/js/vendor/backbone-min.js"
+  "static_files": [
+    "js/vendor/RequireJS.js",
+    "js/vendor/jquery.min.js",
+    "js/vendor/jquery-ui.min.js",
+    "js/vendor/jquery.ui.draggable.js",
+    "js/vendor/jquery.cookie.js",
+    "js/vendor/json2.js",
+    "js/vendor/underscore-min.js",
+    "js/vendor/backbone-min.js"
   ]
 }
diff --git a/common/templates/jasmine/base.html b/common/templates/jasmine/base.html
index 40308c7bbe..9a1b3bed92 100644
--- a/common/templates/jasmine/base.html
+++ b/common/templates/jasmine/base.html
@@ -15,6 +15,10 @@
 
     {% load compressed %}
     {# static files #}
+    {% for url in suite.static_files %}
+    <script src="{{ STATIC_URL }}{{ url }}"></script>
+    {% endfor %}
+
     {% compressed_js 'js-test-source' %}
 
     {# source files #}