pull from master

.gitmodules

-[submodule "common/test/phantom-jasmine"]
-  path = common/test/phantom-jasmine    
-  url = https://github.com/jcarver989/phantom-jasmine.git
\ No newline at end of file

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

package.json

 {
     "name": "mitx",
     "version": "0.1.0",
-    "dependencies": { "coffee-script": "1.6.x"}
-}
+    "dependencies": {
+      "coffee-script": "1.6.X",
\ No newline at end of file
+      "phantom-jasmine": "0.3.X"
+    }
+}

rakefile

@@ -95,7 +95,7 @@ def template_jasmine_runner(lib)
     if !coffee_files.empty?
         sh("node_modules/.bin/coffee -c #{coffee_files.join(' ')}")
     end
-    phantom_jasmine_path = File.expand_path("common/test/phantom-jasmine")
+    phantom_jasmine_path = File.expand_path("node_modules/phantom-jasmine")
     common_js_root = File.expand_path("common/static/js")
     common_coffee_root = File.expand_path("common/static/coffee/src")
 
@@ -319,7 +319,7 @@ end
         compile_assets()
         phantomjs = ENV['PHANTOMJS_PATH'] || 'phantomjs'
         django_for_jasmine(system, false) do |jasmine_url|
-            sh("#{phantomjs} common/test/phantom-jasmine/lib/run_jasmine_test.coffee #{jasmine_url}")
+            sh("#{phantomjs} node_modules/phantom-jasmine/lib/run_jasmine_test.coffee #{jasmine_url}")
         end
     end
 end
@@ -370,7 +370,7 @@ Dir["common/lib/*"].select{|lib| File.directory?(lib)}.each do |lib|
     task "phantomjs_jasmine_#{lib}" do
         phantomjs = ENV['PHANTOMJS_PATH'] || 'phantomjs'
         template_jasmine_runner(lib) do |f|
-            sh("#{phantomjs} common/test/phantom-jasmine/lib/run_jasmine_test.coffee #{f}")
+            sh("#{phantomjs} node_modules/phantom-jasmine/lib/run_jasmine_test.coffee #{f}")
         end
     end
 end