From a5cc3a9ff907bacc8cfaaa594ab791358376e972 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 21 May 2013 13:18:41 -0400 Subject: [PATCH] Revert "Load *.js files more generically for Jasmine tests" This reverts commit e13556b8b6b54b2791fe7bb1ba2ae5cde10114ce. This is because the JS files need to be loaded in a specific order for the tests to run properly, and we don't yet have a way to declare that. --- cms/envs/common.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index 25f919fc0d..d6752686d7 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -220,9 +220,10 @@ PIPELINE_JS = { 'main': { 'source_filenames': sorted( rooted_glob(COMMON_ROOT / 'static/', 'coffee/src/**/*.js') + - rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.js') + - rooted_glob(PROJECT_ROOT / 'static/', 'js/**/*.js') - ) + ['js/hesitate.js', 'js/base.js'], + rooted_glob(PROJECT_ROOT / 'static/', 'coffee/src/**/*.js') + ) + ['js/hesitate.js', 'js/base.js', + 'js/models/feedback.js', 'js/views/feedback.js', + 'js/models/section.js', 'js/views/section.js'], 'output_filename': 'js/cms-application.js', 'test_order': 0 },