Permalink
Browse files

Merge branch 'master' of https://github.com/mainej/jasmine-gem into m…

…ainej-master

Conflicts:
	spec/config_spec.rb
  • Loading branch information...
xian committed Nov 5, 2010
2 parents 0eeac3a + 34be252 commit ff906972d4f8871ae9caa6f703ebb34bed205e1b
Showing with 4 additions and 2 deletions.
  1. +1 −0 Rakefile
  2. +2 −2 lib/jasmine/server.rb
  3. +1 −0 spec/spec_helper.rb
View
@@ -1,3 +1,4 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
$LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
require "bundler"
Bundler.setup
View
@@ -58,7 +58,7 @@ def run(focused_suite = nil)
[
200,
{ 'Content-Type' => 'text/html' },
- body
+ [body]
]
end
end
@@ -82,7 +82,7 @@ def call(env)
[
200,
{ 'Content-Type' => 'application/javascript' },
- "document.write('<p>Couldn\\'t load #{env["PATH_INFO"]}!</p>');"
+ ["document.write('<p>Couldn\\'t load #{env["PATH_INFO"]}!</p>');"]
]
end
end
View
@@ -1,6 +1,7 @@
require "rubygems"
require "bundler"
require 'stringio'
+require 'tmpdir'
Bundler.setup(:default, :test)

0 comments on commit ff90697

Please sign in to comment.