Merge branch 'master' of git@github.com:pivotal/jasmine

Conflicts: Rakefile examples/ruby/Rakefile examples/ruby/spec/jasmine_spec.rb lib/jasmine-0.9.0.js src/Queue.js
2009-09-08 06:48:57 -07:00
parent 2a29bb3ad9 11f356e375
commit 724f1772b7
30 changed files with 3606 additions and 3370 deletions
@@ -1,3 +1,5 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec/jasmine_helper.rb"))
+
 namespace :test do
  desc "Run continuous integration tests"
  require "spec"
@@ -11,16 +13,12 @@ end

 desc "Run specs via server"
 task :jasmine_server do
-  require File.expand_path(File.join(File.dirname(__FILE__), "../../contrib/ruby/jasmine_spec_builder"))
-
-  dir_mappings = {
-    "/spec" => 'spec'
-  }
-
-  spec_files = Dir.glob("spec/**/*[Ss]pec.js")
+  require File.expand_path(File.join(JasmineHelper.jasmine_root, "contrib/ruby/jasmine_spec_builder"))

  puts "your tests are here:"
-  puts "  http://localhost:8888/"
+  puts "  http://localhost:8888/run.html"

-  Jasmine::SimpleServer.start(8888, spec_files, dir_mappings)
+  Jasmine::SimpleServer.start(8888,
+                              lambda { JasmineHelper.jasmine + JasmineHelper.spec_file_urls },
+                              JasmineHelper.dir_mappings)
 end