Merge pull request #2022 from edx/kill-submodules

Install phantom-jasmine via npm, rather than git submodules
2013-05-13 12:02:41 -07:00
parent 554d342f4e 7c98981498
commit f0bd73b2fb
4 changed files with 9 additions and 9 deletions
--- a/cms/envs/jasmine.py
+++ b/cms/envs/jasmine.py
@@ -33,7 +33,7 @@ PIPELINE_JS['spec'] = {

 JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'

-STATICFILES_DIRS.append(COMMON_ROOT / 'test' / 'phantom-jasmine' / 'lib')
+STATICFILES_DIRS.append(REPO_ROOT/'node_modules/phantom-jasmine/lib')

 # Remove the localization middleware class because it requires the test database
 # to be sync'd and migrated in order to run the jasmine tests interactively