lib/capybara/webkit/driver.rb in capybara-webkit-0.13.2 vs lib/capybara/webkit/driver.rb in capybara-webkit-0.14.0

@@ -12,12 +12,10 @@
     attr_reader :browser
 
     def initialize(app, options={})
       @app = app
       @options = options
-      @rack_server = Capybara::Server.new(@app)
-      @rack_server.boot if Capybara.run_server
       @browser = options[:browser] || Browser.new(Connection.new(options))
     end
 
     def enable_logging
       browser.enable_logging
@@ -25,27 +23,19 @@
 
     def current_url
       browser.current_url
     end
 
-    def requested_url
-      browser.requested_url
-    end
-
     def visit(path)
-      browser.visit(url(path))
+      browser.visit(path)
     end
 
     def find(query)
       browser.find(query).map { |native| Node.new(self, native) }
     end
 
-    def source
-      browser.source
-    end
-
-    def body
+    def html
       browser.body
     end
 
     def header(key, value)
       browser.header(key, value)
@@ -145,42 +135,35 @@
 
     def wait?
       true
     end
 
-    def wait_until(*args)
+    def needs_server?
+      true
     end
 
     def reset!
       browser.reset!
     end
 
     def has_shortcircuit_timeout?
       false
     end
 
-    def render(path, options={})
+    def save_screenshot(path, options={})
       options[:width]  ||= 1000
       options[:height] ||= 10
 
       browser.render path, options[:width], options[:height]
     end
 
-    def server_port
-      @rack_server.port
-    end
-
     def cookies
       @cookie_jar ||= CookieJar.new(browser)
     end
 
     def invalid_element_errors
       []
     end
 
     private
-
-    def url(path)
-      @rack_server.url(path)
-    end
   end
 end