qt 4.8 webkit doesn't use working dir to resolve local file urls anym…

…ore, fixes #101
johnbintz · Jan 3, 2012 · 7587381 · 7587381
1 parent df83a61
commit 7587381
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/jasmine-webkit-specrunner/Runner.cpp b/ext/jasmine-webkit-specrunner/Runner.cpp
@@ -70,7 +70,7 @@ void Runner::loadSpec()
     outputFiles.enqueue(outputFile);
   }
 
-  page.mainFrame()->load(runnerFiles.dequeue());
+  page.mainFrame()->load(QUrl::fromLocalFile(runnerFiles.dequeue()));
   ticker.start();
 }
 

diff --git a/lib/jasmine/headless/runner.rb b/lib/jasmine/headless/runner.rb
@@ -62,7 +62,7 @@ def jasmine_command(*targets)
           command << "-r #{file}"
         end
 
-        command += targets
+        command += targets.flatten.collect { |target| File.expand_path(target) }
 
         command.compact.join(' ')
       end