github-migration/jasmine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More changes, specs.

Browse Source
This commit is contained in:
Christian Williams 2009-12-28 15:10:27 -06:00
parent 59c85355fc
commit 73c8fef43e
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
lib/jasmine/run.html → lib/jasmine/run.html.erb
View File

3
lib/jasmine/server.rb
View File

@ -15,12 +15,13 @@ module Jasmine
run run
end end
#noinspection RubyUnusedLocalVariable
def run def run
jasmine_files = @jasmine_files jasmine_files = @jasmine_files
css_files = @jasmine_stylesheets + (Jasmine.files(@config.stylesheets) || []) css_files = @jasmine_stylesheets + (Jasmine.files(@config.stylesheets) || [])
js_files = Jasmine.files(@config.js_files) js_files = Jasmine.files(@config.js_files)
body = ERB.new(File.read(File.join(File.dirname(__FILE__), "run.html"))).result(binding) body = ERB.new(File.read(File.join(File.dirname(__FILE__), "run.html.erb"))).result(binding)
[ [
200, 200,
{ 'Content-Type' => 'text/html' }, { 'Content-Type' => 'text/html' },

4
spec/server_spec.rb
View File

@ -45,7 +45,8 @@ describe Jasmine::Server do
headers["Location"].should == "/" headers["Location"].should == "/"
end end
it "should serve /" do describe "/ page" do
it "should load each js file in order" do
code, headers, body = @thin_app.call("PATH_INFO" => "/", "SCRIPT_NAME" => "xxx") code, headers, body = @thin_app.call("PATH_INFO" => "/", "SCRIPT_NAME" => "xxx")
code.should == 200 code.should == 200
body = read(body) body = read(body)
@ -54,3 +55,4 @@ describe Jasmine::Server do
body.should satisfy {|s| s.index("/src/file1.js") < s.index("/spec/file2.js") } body.should satisfy {|s| s.index("/src/file1.js") < s.index("/spec/file2.js") }
end end
end end
end