From 56596228dcabd36dc8c2d83123119e7c8d1c6bb9 Mon Sep 17 00:00:00 2001 From: Shaoquan Chen Date: Fri, 19 Jun 2015 18:21:30 -0700 Subject: [PATCH] Applying auto-file-discovery partially This patch applies auto-file-discovery to - horizon/horizon/horizon/static/ - horizon/openstack_dashboard/static/openstack-service-api/ Change-Id: I3477f0fa3912f6381474e4278037f909aa9fa55a Co-Authored-By: Richard Jones Co-Authored-By: Thai Tran Partially-Implements: blueprint auto-js-file-finding --- horizon/site_urls.py | 2 +- .../templates/horizon/jasmine/jasmine.html | 25 ++-- horizon/test/jasmine/jasmine.py | 35 +---- horizon/test/jasmine/jasmine_tests.py | 136 ------------------ horizon/test/urls.py | 2 +- openstack_dashboard/settings.py | 24 ++++ .../templates/horizon/_scripts.html | 71 --------- 7 files changed, 37 insertions(+), 258 deletions(-) delete mode 100644 horizon/test/jasmine/jasmine_tests.py diff --git a/horizon/site_urls.py b/horizon/site_urls.py index 5dc78e8cb..2f3fbaa75 100644 --- a/horizon/site_urls.py +++ b/horizon/site_urls.py @@ -47,4 +47,4 @@ if settings.DEBUG: url(r'^qunit/$', TemplateView.as_view(template_name="horizon/qunit.html"), name='qunit_tests'), - url(r'^jasmine/(.*?)$', jasmine.dispatcher)) + url(r'^jasmine/.*?$', jasmine.dispatcher)) diff --git a/horizon/templates/horizon/jasmine/jasmine.html b/horizon/templates/horizon/jasmine/jasmine.html index c352c30cf..c24ce3a03 100644 --- a/horizon/templates/horizon/jasmine/jasmine.html +++ b/horizon/templates/horizon/jasmine/jasmine.html @@ -20,6 +20,7 @@ + - {% for file in sources %} - - {% endfor %} - - - {% for file in specs %} - - {% endfor %} - - {% for file in HORIZON_CONFIG.js_files %} {% endfor %} - - {% for file in HORIZON_CONFIG.js_spec_files %} - - {% endfor %} - + + {% for file in HORIZON_CONFIG.js_spec_files %} + + {% endfor %} +