Commit 6b94090e by Will Daly

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.
parent 618de5df
{ {
"js_files": [ "static_files": [
"/static/js/vendor/RequireJS.js", "js/vendor/RequireJS.js",
"/static/js/vendor/jquery.min.js", "js/vendor/jquery.min.js",
"/static/js/vendor/jquery-ui.min.js", "js/vendor/jquery-ui.min.js",
"/static/js/vendor/jquery.ui.draggable.js", "js/vendor/jquery.ui.draggable.js",
"/static/js/vendor/jquery.cookie.js", "js/vendor/jquery.cookie.js",
"/static/js/vendor/json2.js", "js/vendor/json2.js",
"/static/js/vendor/underscore-min.js", "js/vendor/underscore-min.js",
"/static/js/vendor/backbone-min.js" "js/vendor/backbone-min.js"
] ]
} }
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
{% load compressed %} {% load compressed %}
{# static files #} {# static files #}
{% for url in suite.static_files %}
<script src="{{ STATIC_URL }}{{ url }}"></script>
{% endfor %}
{% compressed_js 'js-test-source' %} {% compressed_js 'js-test-source' %}
{# source files #} {# source files #}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment