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

clean up some fixes

Browse Source
This commit is contained in:
John Bintz 2012-01-12 18:07:08 -05:00
parent 09842c0539
commit 8de1bd8cf0
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/jasmine-webkit-specrunner/Runner.cpp
View File

@ -71,7 +71,9 @@ void Runner::loadSpec()
outputFiles.enqueue(outputFile); outputFiles.enqueue(outputFile);
} }
page.mainFrame()->load(runnerFiles.dequeue()); QString runnerFile = runnerFiles.dequeue();
page.mainFrame()->load(runnerFile);
ticker.start(); ticker.start();
} }

6
lib/jasmine/headless/runner.rb
View File

@ -64,7 +64,11 @@ module Jasmine
command += targets.flatten.collect do |target| command += targets.flatten.collect do |target|
target = File.expand_path(target) target = File.expand_path(target)
target = server_uri + target if options[:use_server] if options[:use_server]
target = server_uri + target
else
target = "file://" + target
end
target target
end end

2
spec/lib/jasmine/headless/runner_spec.rb
View File

@ -70,7 +70,7 @@ describe Jasmine::Headless::Runner do
end end
def self.it_should_have_basics def self.it_should_have_basics
it { should include(target) } it { should include('file://' + File.expand_path(target)) }
end end
context 'colors' do context 'colors' do