lib/capybara/driver/webkit.rb in capybara-webkit-0.5.0 vs lib/capybara/driver/webkit.rb in capybara-webkit-0.6.0

@@ -1,13 +1,17 @@
 require "capybara"
 require "capybara/driver/webkit/node"
 require "capybara/driver/webkit/browser"
+require "capybara/driver/webkit/socket_debugger"
 
 class Capybara::Driver::Webkit
-  class WebkitError < StandardError
+  class WebkitInvalidResponseError < StandardError
   end
 
+  class WebkitNoResponseError < StandardError
+  end
+
   attr_reader :browser
 
   def initialize(app, options={})
     @app = app
     @options = options
@@ -31,15 +35,20 @@
   def source
     browser.source
   end
 
   def body
-    source
+    browser.body
   end
 
+  def header(key, value)
+    browser.header(key, value)
+  end
+
   def execute_script(script)
-    browser.execute_script script
+    value = browser.execute_script script
+    value.empty? ? nil : value
   end
 
   def evaluate_script(script)
     browser.evaluate_script script
   end
@@ -76,9 +85,20 @@
     browser.reset!
   end
 
   def has_shortcircuit_timeout?
     false
+  end
+
+  def render(path, options={})
+    options[:width]  ||= 1000
+    options[:height] ||= 10
+
+    browser.render path, options[:width], options[:height]
+  end
+
+  def server_port
+    @rack_server.port
   end
 
   private
 
   def url(path)