Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Load *.js files more generically for Jasmine tests"

Browse Source 
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.
This commit is contained in:
David Baumgold
2013-05-21 13:18:41 -04:00
parent bc6e480103
commit a5cc3a9ff9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/envs/common.py
View File

@@ -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
},