Modify rake file to read in spec and src files correctly and also add in the lms…

Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc.

Modify rake file to read in spec and src files correctly and also add in the lms…
Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc.
bf6a147c · Jay Zoldak · 93cc17cf · bf6a147c · bf6a147c
Commit bf6a147c authored Nov 15, 2012 by Jay Zoldak
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 4 deletions

common/lib/xmodule/jasmine_test_runner.html.erb
+2 -2

rakefile
+16 -2

No files found.
--- a/common/lib/xmodule/jasmine_test_runner.html.erb
+++ b/common/lib/xmodule/jasmine_test_runner.html.erb
@@ -25,9 +25,9 @@
  <script type="text/javascript" src="<%= src %>"></script>
  <% end %>

-  <!-- TEST FILES -->
+  <!-- SPEC FILES -->
  <% for src in js_specs %>
-  <script type="text/javascript" src="<%= src%>"></script>
+  <script type="text/javascript" src="<%= src %>"></script>
  <% end %>
 </head>
 <body>

--- a/rakefile
+++ b/rakefile
@@ -89,8 +89,22 @@ def template_jasmine_runner(lib)
    phantom_jasmine_path = File.expand_path("common/test/phantom-jasmine")
    common_js_root = File.expand_path("common/static/js")
    common_coffee_root = File.expand_path("common/static/coffee/src")
-    js_specs = Dir["#{lib}/**/js/spec/**/*.js"].sort_by {|p| [p.split('/').length, p]} .map {|f| File.expand_path(f)}
-    js_source = Dir["#{lib}/**/*.js"].sort_by {|p| [p.split('/').length, p]} .map {|f| File.expand_path(f)} - js_specs
+
+    # Get arrays of spec and source files, ordered by how deep they are nested below the library
+    # (and then alphabetically) and expanded from a relative to an absolute path
+    spec_glob = File.join("#{lib}", "**", "spec", "**", "*.js")
+    src_glob = File.join("#{lib}", "**", "src", "**", "*.js")
+    js_specs = Dir[spec_glob].sort_by {|p| [p.split('/').length, p]} .map {|f| File.expand_path(f)}
+    js_source = Dir[src_glob].sort_by {|p| [p.split('/').length, p]} .map {|f| File.expand_path(f)}
+
+    # helper file
+    helper_coffee = "#{REPO_ROOT}/lms/static/coffee/spec/helper.coffee"
+    if File.exists?(helper_coffee)
+        sh("coffee -c #{helper_coffee}")
+        # Add the compiled helper to the beginning of the specs array
+        js_specs.unshift("#{REPO_ROOT}/lms/static/coffee/spec/helper.js")
+    end
+
    template = ERB.new(File.read("#{lib}/jasmine_test_runner.html.erb"))
    template_output = "#{lib}/jasmine_test_runner.html"
    File.open(template_output, 'w') do |f|