otherinbox-capybara-webkit 0.12.0 → 0.12.0.1

data/lib/capybara/{driver/webkit → webkit}/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = '0.12.0'.freeze
+      VERSION = '0.12.0.1'.freeze
     end
   end
 end

data/lib/capybara_webkit_builder.rb

@@ -4,6 +4,9 @@ require "rbconfig"
 module CapybaraWebkitBuilder
   extend self
 
+  SUCCESS_STATUS = 0
+  COMMAND_NOT_FOUND_STATUS = 127
+
   def make_bin
     ENV['MAKE'] || 'make'
   end
@@ -29,12 +32,23 @@ module CapybaraWebkitBuilder
     end
   end
 
+  def sh(command)
+    system(command)
+    success = $?.exitstatus == SUCCESS_STATUS
+    if $?.exitstatus == COMMAND_NOT_FOUND_STATUS
+      puts "Command '#{command}' not available"
+    elsif !success
+      puts "Command '#{command}' failed"
+    end
+    success
+  end
+
   def makefile
-    system("#{qmake_bin} -spec #{spec}")
+    sh("#{qmake_bin} -spec #{spec}")
   end
 
   def qmake
-    system("#{make_bin} qmake")
+    sh("#{make_bin} qmake")
   end
 
   def path_to_binary
@@ -47,7 +61,7 @@ module CapybaraWebkitBuilder
   end
 
   def build
-    system(make_bin) or return false
+    sh(make_bin) or return false
 
     FileUtils.mkdir("bin") unless File.directory?("bin")
     FileUtils.cp(path_to_binary, "bin", :preserve => true)

data/spec/browser_spec.rb

@@ -1,21 +1,20 @@
 require 'spec_helper'
 require 'self_signed_ssl_cert'
 require 'stringio'
-require 'capybara/driver/webkit/browser'
-require 'capybara/driver/webkit/connection'
+require 'capybara/webkit/driver'
 require 'socket'
 require 'base64'
 
-describe Capybara::Driver::Webkit::Browser do
+describe Capybara::Webkit::Browser do
 
-  let(:browser) { Capybara::Driver::Webkit::Browser.new(Capybara::Driver::Webkit::Connection.new) }
+  let(:browser) { Capybara::Webkit::Browser.new(Capybara::Webkit::Connection.new) }
   let(:browser_ignore_ssl_err) do
-    Capybara::Driver::Webkit::Browser.new(Capybara::Driver::Webkit::Connection.new).tap do |browser|
+    Capybara::Webkit::Browser.new(Capybara::Webkit::Connection.new).tap do |browser|
       browser.ignore_ssl_errors
     end
   end
   let(:browser_skip_images) do
-    Capybara::Driver::Webkit::Browser.new(Capybara::Driver::Webkit::Connection.new).tap do |browser|
+    Capybara::Webkit::Browser.new(Capybara::Webkit::Connection.new).tap do |browser|
       browser.set_skip_image_loading(true)
     end
   end
@@ -62,6 +61,18 @@ describe Capybara::Driver::Webkit::Browser do
     it 'accepts a self-signed certificate if configured to do so' do
       browser_ignore_ssl_err.visit "https://#{@host}:#{@port}/"
     end
+
+    it "doesn't accept a self-signed certificate in a new window by default" do
+      browser.execute_script("window.open('about:blank')")
+      browser.window_focus(browser.get_window_handles.last)
+      lambda { browser.visit "https://#{@host}:#{@port}/" }.should raise_error
+    end
+
+    it 'accepts a self-signed certificate in a new window if configured to do so' do
+      browser_ignore_ssl_err.execute_script("window.open('about:blank')")
+      browser_ignore_ssl_err.window_focus(browser_ignore_ssl_err.get_window_handles.last)
+      browser_ignore_ssl_err.visit "https://#{@host}:#{@port}/"
+    end
   end
 
   context "skip image loading" do
@@ -72,18 +83,19 @@ describe Capybara::Driver::Webkit::Browser do
       @port = @server.addr[1]
       @received_requests = []
 
-      @server_thread = Thread.new(@server) do |serv|
-        while conn = serv.accept do
-          # read request
-          request = []
-          until (line = conn.readline.strip).empty?
-            request << line
-          end
+      @server_thread = Thread.new do
+        while conn = @server.accept
+          Thread.new(conn) do |conn|
+            # read request
+            request = []
+            until (line = conn.readline.strip).empty?
+              request << line
+            end
 
-          @received_requests << request.join("\n")
+            @received_requests << request.join("\n")
 
-          # write response
-          html = <<-HTML
+            # write response
+            html = <<-HTML
             <html>
               <head>
                 <style>
@@ -96,14 +108,15 @@ describe Capybara::Driver::Webkit::Browser do
                 <img src="/path/to/image"/>
               </body>
             </html>
-        HTML
-          conn.write "HTTP/1.1 200 OK\r\n"
-          conn.write "Content-Type:text/html\r\n"
-          conn.write "Content-Length: %i\r\n" % html.size
-          conn.write "\r\n"
-          conn.write html
-          conn.write("\r\n\r\n")
-          conn.close
+            HTML
+            conn.write "HTTP/1.1 200 OK\r\n"
+            conn.write "Content-Type:text/html\r\n"
+            conn.write "Content-Length: %i\r\n" % html.size
+            conn.write "\r\n"
+            conn.write html
+            conn.write("\r\n\r\n")
+            conn.close
+          end
         end
       end
     end
@@ -241,7 +254,7 @@ describe Capybara::Driver::Webkit::Browser do
     connection.stub(:gets).and_return("ok\n", "0\n")
     connection.stub(:read).and_raise(StandardError.new("tried to read empty response"))
 
-    browser = Capybara::Driver::Webkit::Browser.new(connection)
+    browser = Capybara::Webkit::Browser.new(connection)
 
     expect { browser.visit("/") }.not_to raise_error(/empty response/)
   end

data/spec/connection_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'capybara/driver/webkit/connection'
+require 'capybara/webkit/connection'
 
-describe Capybara::Driver::Webkit::Connection do
+describe Capybara::Webkit::Connection do
   it "boots a server to talk to" do
     url = @rack_server.url("/")
     connection.puts "Visit"
@@ -20,7 +20,7 @@ describe Capybara::Driver::Webkit::Connection do
 
   it 'forwards stdout to the given IO object' do
     io = StringIO.new
-    redirected_connection = Capybara::Driver::Webkit::Connection.new(:stdout => io)
+    redirected_connection = Capybara::Webkit::Connection.new(:stdout => io)
     script = 'console.log("hello world")'
     redirected_connection.puts "Execute"
     redirected_connection.puts 1
@@ -35,11 +35,11 @@ describe Capybara::Driver::Webkit::Connection do
   end
 
   it "chooses a new port number for a new connection" do
-    new_connection = Capybara::Driver::Webkit::Connection.new
+    new_connection = Capybara::Webkit::Connection.new
     new_connection.port.should_not == connection.port
   end
 
-  let(:connection) { Capybara::Driver::Webkit::Connection.new }
+  let(:connection) { Capybara::Webkit::Connection.new }
 
   before(:all) do
     @app = lambda do |env|

data/spec/cookie_jar_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'capybara/driver/webkit/cookie_jar'
+require 'capybara/webkit/cookie_jar'
 
-describe Capybara::Driver::Webkit::CookieJar do
+describe Capybara::Webkit::CookieJar do
   let(:browser) {
     browser = double("Browser")
     browser.stub(:get_cookies) { [
@@ -13,7 +13,7 @@ describe Capybara::Driver::Webkit::CookieJar do
     browser
   }
 
-  subject { Capybara::Driver::Webkit::CookieJar.new(browser) }
+  subject { Capybara::Webkit::CookieJar.new(browser) }
 
   describe "#find" do
     it "returns a cookie object" do

data/spec/driver_rendering_spec.rb

@@ -1,43 +1,37 @@
 require 'spec_helper'
-require 'capybara/driver/webkit'
+require 'capybara/webkit/driver'
 require 'mini_magick'
 
-describe Capybara::Driver::Webkit, "rendering an image" do
+describe Capybara::Webkit::Driver, "rendering an image" do
+  include AppRunner
+
+  let(:driver) do
+    driver_for_html(<<-HTML)
+      <html>
+        <body>
+          <h1>Hello World</h1>
+        </body>
+      </html>
+    HTML
+  end
 
-  before(:all) do
+  before(:each) do
     # Set up the tmp directory and file name
     tmp_dir    = File.join(PROJECT_ROOT, 'tmp')
     FileUtils.mkdir_p tmp_dir
     @file_name = File.join(tmp_dir, 'render-test.png')
-
-    app = lambda do |env|
-      body = <<-HTML
-        <html>
-          <body>
-            <h1>Hello World</h1>
-          </body>
-        </html>
-      HTML
-      [200,
-        { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-        [body]]
-    end
-
-    @driver = Capybara::Driver::Webkit.new(app, :browser => $webkit_browser)
-    @driver.visit("/hello/world?success=true")
+    driver.visit '/'
   end
 
-  after(:all) { @driver.reset! }
-
   def render(options)
     FileUtils.rm_f @file_name
-    @driver.render @file_name, options
+    driver.render @file_name, options
 
     @image = MiniMagick::Image.open @file_name
   end
 
   context "with default options" do
-    before(:all){ render({}) }
+    before { render({}) }
 
     it "should be a PNG" do
       @image[:format].should == "PNG"
@@ -54,7 +48,7 @@ describe Capybara::Driver::Webkit, "rendering an image" do
   end
 
   context "with dimensions set larger than necessary" do
-    before(:all){ render(:width => 500, :height => 400) }
+    before { render(:width => 500, :height => 400) }
 
     it "width should match the width given" do
       @image[:width].should == 500
@@ -66,7 +60,7 @@ describe Capybara::Driver::Webkit, "rendering an image" do
   end
 
   context "with dimensions set smaller than the document's default" do
-    before(:all){ render(:width => 50, :height => 10) }
+    before { render(:width => 50, :height => 10) }
 
     it "width should be greater than the width given" do
       @image[:width].should > 50
@@ -76,5 +70,4 @@ describe Capybara::Driver::Webkit, "rendering an image" do
       @image[:height].should > 10
     end
   end
-
 end

data/spec/driver_resize_window_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'capybara/driver/webkit'
+require 'capybara/webkit/driver'
 
-describe Capybara::Driver::Webkit, "#resize_window(width, height)" do
+describe Capybara::Webkit::Driver, "#resize_window(width, height)" do
 
   before(:all) do
     app = lambda do |env|
@@ -27,7 +27,7 @@ describe Capybara::Driver::Webkit, "#resize_window(width, height)" do
       ]
     end
 
-    @driver = Capybara::Driver::Webkit.new(app, :browser => $webkit_browser)
+    @driver = Capybara::Webkit::Driver.new(app, :browser => $webkit_browser)
   end
 
   DEFAULT_DIMENTIONS = "[1680x1050]"

data/spec/driver_spec.rb

@@ -1,117 +1,144 @@
 require 'spec_helper'
-require 'capybara/driver/webkit'
+require 'capybara/webkit/driver'
+require 'base64'
 
-describe Capybara::Driver::Webkit do
-  subject { Capybara::Driver::Webkit.new(@app, :browser => $webkit_browser) }
-  before { subject.visit("/hello/world?success=true") }
-  after { subject.reset! }
+describe Capybara::Webkit::Driver do
+  include AppRunner
 
   context "iframe app" do
-    before(:all) do
-      @app = lambda do |env|
-        params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
-        if params["iframe"] == "true"
-          # We are in an iframe request.
-          p_id = "farewell"
-          msg  = "goodbye"
-          iframe = nil
-        else
-          # We are not in an iframe request and need to make an iframe!
-          p_id = "greeting"
-          msg  = "hello"
-          iframe = "<iframe id=\"f\" src=\"/?iframe=true\"></iframe>"
+    let(:driver) do
+      driver_for_app do
+        get "/" do
+          if in_iframe_request?
+            p_id = "farewell"
+            msg  = "goodbye"
+            iframe = nil
+          else
+            p_id = "greeting"
+            msg  = "hello"
+            iframe = "<iframe id=\"f\" src=\"/?iframe=true\"></iframe>"
+          end
+          <<-HTML
+            <html>
+              <head>
+                <style type="text/css">
+                  #display_none { display: none }
+                </style>
+              </head>
+              <body>
+                #{iframe}
+                <script type="text/javascript">
+                  document.write("<p id='#{p_id}'>#{msg}</p>");
+                </script>
+              </body>
+            </html>
+          HTML
+        end
+
+        def in_iframe_request?
+          params[:iframe] == "true"
         end
-        body = <<-HTML
-          <html>
-            <head>
-              <style type="text/css">
-                #display_none { display: none }
-              </style>
-            </head>
-            <body>
-              #{iframe}
-              <script type="text/javascript">
-                document.write("<p id='#{p_id}'>#{msg}</p>");
-              </script>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
       end
     end
 
+    before do
+      driver.visit("/")
+    end
+
     it "finds frames by index" do
-      subject.within_frame(0) do
-        subject.find("//*[contains(., 'goodbye')]").should_not be_empty
+      driver.within_frame(0) do
+        driver.find("//*[contains(., 'goodbye')]").should_not be_empty
       end
     end
 
     it "finds frames by id" do
-      subject.within_frame("f") do
-        subject.find("//*[contains(., 'goodbye')]").should_not be_empty
+      driver.within_frame("f") do
+        driver.find("//*[contains(., 'goodbye')]").should_not be_empty
       end
     end
 
     it "raises error for missing frame by index" do
-      expect { subject.within_frame(1) { } }.
-        to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError)
+      expect { driver.within_frame(1) { } }.
+        to raise_error(Capybara::Webkit::InvalidResponseError)
     end
 
     it "raise_error for missing frame by id" do
-      expect { subject.within_frame("foo") { } }.
-        to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError)
+      expect { driver.within_frame("foo") { } }.
+        to raise_error(Capybara::Webkit::InvalidResponseError)
     end
 
     it "returns an attribute's value" do
-      subject.within_frame("f") do
-        subject.find("//p").first["id"].should == "farewell"
+      driver.within_frame("f") do
+        driver.find("//p").first["id"].should == "farewell"
       end
     end
 
     it "returns a node's text" do
-      subject.within_frame("f") do
-        subject.find("//p").first.text.should == "goodbye"
+      driver.within_frame("f") do
+        driver.find("//p").first.text.should == "goodbye"
       end
     end
 
     it "returns the current URL" do
-      subject.within_frame("f") do
-        port = subject.instance_variable_get("@rack_server").port
-        subject.current_url.should == "http://127.0.0.1:#{port}/?iframe=true"
+      driver.within_frame("f") do
+        driver.current_url.should == driver_url(driver, "/?iframe=true")
       end
     end
 
     it "returns the source code for the page" do
-      subject.within_frame("f") do
-        subject.source.should =~ %r{<html>.*farewell.*}m
+      driver.within_frame("f") do
+        driver.source.should =~ %r{<html>.*farewell.*}m
       end
     end
 
     it "evaluates Javascript" do
-      subject.within_frame("f") do
-        result = subject.evaluate_script(%<document.getElementById('farewell').innerText>)
+      driver.within_frame("f") do
+        result = driver.evaluate_script(%<document.getElementById('farewell').innerText>)
         result.should == "goodbye"
       end
     end
 
     it "executes Javascript" do
-      subject.within_frame("f") do
-        subject.execute_script(%<document.getElementById('farewell').innerHTML = 'yo'>)
-        subject.find("//p[contains(., 'yo')]").should_not be_empty
+      driver.within_frame("f") do
+        driver.execute_script(%<document.getElementById('farewell').innerHTML = 'yo'>)
+        driver.find("//p[contains(., 'yo')]").should_not be_empty
+      end
+    end
+  end
+
+  context "error iframe app" do
+    let(:driver) do
+      driver_for_app do
+        get "/inner-not-found" do
+          invalid_response
+        end
+
+        get "/" do
+          <<-HTML
+            <html>
+              <body>
+                <iframe src="/inner-not-found"></iframe>
+              </body>
+            </html>
+          HTML
+        end
       end
     end
+
+    it "raises error whose message references the actual missing url" do
+      expect { driver.visit("/") }.to raise_error(Capybara::Webkit::InvalidResponseError, /inner-not-found/)
+    end
   end
 
   context "redirect app" do
-    before(:all) do
-      @app = lambda do |env|
-        if env['PATH_INFO'] == '/target'
-          content_type = "<p>#{env['CONTENT_TYPE']}</p>"
-          [200, {"Content-Type" => "text/html", "Content-Length" => content_type.length.to_s}, [content_type]]
-        elsif env['PATH_INFO'] == '/form'
-          body = <<-HTML
+    let(:driver) do
+      driver_for_app do
+        get '/target' do
+          "<p>#{env['CONTENT_TYPE']}</p>"
+        end
+
+        get '/form' do
+          <<-HTML
             <html>
               <body>
                 <form action="/redirect" method="POST" enctype="multipart/form-data">
@@ -120,369 +147,359 @@ describe Capybara::Driver::Webkit do
               </body>
             </html>
           HTML
-          [200, {"Content-Type" => "text/html", "Content-Length" => body.length.to_s}, [body]]
-        else
-          [301, {"Location" => "/target"}, [""]]
+        end
+
+        post '/redirect' do
+          redirect '/target'
         end
       end
     end
 
     it "should redirect without content type" do
-      subject.visit("/form")
-      subject.find("//input").first.click
-      subject.find("//p").first.text.should == ""
+      driver.visit("/form")
+      driver.find("//input").first.click
+      driver.find("//p").first.text.should == ""
     end
 
     it "returns the current URL when changed by pushState after a redirect" do
-      subject.visit("/redirect-me")
-      port = subject.instance_variable_get("@rack_server").port
-      subject.execute_script("window.history.pushState({}, '', '/pushed-after-redirect')")
-      subject.current_url.should == "http://127.0.0.1:#{port}/pushed-after-redirect"
+      driver.visit("/redirect-me")
+      driver.execute_script("window.history.pushState({}, '', '/pushed-after-redirect')")
+      driver.current_url.should == driver_url(driver, "/pushed-after-redirect")
     end
 
     it "returns the current URL when changed by replaceState after a redirect" do
-      subject.visit("/redirect-me")
-      port = subject.instance_variable_get("@rack_server").port
-      subject.execute_script("window.history.replaceState({}, '', '/replaced-after-redirect')")
-      subject.current_url.should == "http://127.0.0.1:#{port}/replaced-after-redirect"
+      driver.visit("/redirect-me")
+      driver.execute_script("window.history.replaceState({}, '', '/replaced-after-redirect')")
+      driver.current_url.should == driver_url(driver, "/replaced-after-redirect")
     end
   end
 
   context "css app" do
-    before(:all) do
-      body = "css"
-      @app = lambda do |env|
-        [200, {"Content-Type" => "text/css", "Content-Length" => body.length.to_s}, [body]]
+    let(:driver) do
+      driver_for_app do
+        get "/" do
+          headers "Content-Type" => "text/css"
+          "css"
+        end
       end
-      subject.visit("/")
     end
 
+    before { driver.visit("/") }
+
     it "renders unsupported content types gracefully" do
-      subject.body.should =~ /css/
+      driver.body.should =~ /css/
     end
 
     it "sets the response headers with respect to the unsupported request" do
-      subject.response_headers["Content-Type"].should == "text/css"
+      driver.response_headers["Content-Type"].should == "text/css"
     end
   end
 
   context "hello app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <head>
-              <style type="text/css">
-                #display_none { display: none }
-              </style>
-            </head>
-            <body>
-              <div class='normalize'>Spaces&nbsp;not&nbsp;normalized&nbsp;</div>
-              <div id="display_none">
-                <div id="invisible">Can't see me</div>
-              </div>
-              <input type="text" disabled="disabled"/>
-              <input id="checktest" type="checkbox" checked="checked"/>
-              <script type="text/javascript">
-                document.write("<p id='greeting'>he" + "llo</p>");
-              </script>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <head>
+            <style type="text/css">
+              #display_none { display: none }
+            </style>
+          </head>
+          <body>
+            <div class='normalize'>Spaces&nbsp;not&nbsp;normalized&nbsp;</div>
+            <div id="display_none">
+              <div id="invisible">Can't see me</div>
+            </div>
+            <input type="text" disabled="disabled"/>
+            <input id="checktest" type="checkbox" checked="checked"/>
+            <script type="text/javascript">
+              document.write("<p id='greeting'>he" + "llo</p>");
+            </script>
+          </body>
+        </html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     it "handles anchor tags" do
-      subject.visit("#test")
-      subject.find("//*[contains(., 'hello')]").should_not be_empty
-      subject.visit("#test")
-      subject.find("//*[contains(., 'hello')]").should_not be_empty
+      driver.visit("#test")
+      driver.find("//*[contains(., 'hello')]").should_not be_empty
+      driver.visit("#test")
+      driver.find("//*[contains(., 'hello')]").should_not be_empty
     end
 
     it "finds content after loading a URL" do
-      subject.find("//*[contains(., 'hello')]").should_not be_empty
+      driver.find("//*[contains(., 'hello')]").should_not be_empty
     end
 
     it "has an empty page after reseting" do
-      subject.reset!
-      subject.find("//*[contains(., 'hello')]").should be_empty
+      driver.reset!
+      driver.find("//*[contains(., 'hello')]").should be_empty
     end
 
-    it "has a location of 'about:blank' after reseting" do
-      subject.reset!
-      subject.current_url.should == "about:blank"
+    it "has a blank location after reseting" do
+      driver.reset!
+      driver.current_url.should == ""
     end
 
     it "raises an error for an invalid xpath query" do
-      expect { subject.find("totally invalid salad") }.
-        to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError, /xpath/i)
+      expect { driver.find("totally invalid salad") }.
+        to raise_error(Capybara::Webkit::InvalidResponseError, /xpath/i)
     end
 
     it "returns an attribute's value" do
-      subject.find("//p").first["id"].should == "greeting"
+      driver.find("//p").first["id"].should == "greeting"
     end
 
     it "parses xpath with quotes" do
-      subject.find('//*[contains(., "hello")]').should_not be_empty
+      driver.find('//*[contains(., "hello")]').should_not be_empty
     end
 
     it "returns a node's text" do
-      subject.find("//p").first.text.should == "hello"
+      driver.find("//p").first.text.should == "hello"
     end
 
     it "normalizes a node's text" do
-      subject.find("//div[contains(@class, 'normalize')]").first.text.should == "Spaces not normalized"
+      driver.find("//div[contains(@class, 'normalize')]").first.text.should == "Spaces not normalized"
     end
 
     it "returns the current URL" do
-      port = subject.instance_variable_get("@rack_server").port
-      subject.current_url.should == "http://127.0.0.1:#{port}/hello/world?success=true"
+      driver.visit "/hello/world?success=true"
+      driver.current_url.should == driver_url(driver, "/hello/world?success=true")
     end
 
     it "returns the current URL when changed by pushState" do
-      port = subject.instance_variable_get("@rack_server").port
-      subject.execute_script("window.history.pushState({}, '', '/pushed')")
-      subject.current_url.should == "http://127.0.0.1:#{port}/pushed"
+      driver.execute_script("window.history.pushState({}, '', '/pushed')")
+      driver.current_url.should == driver_url(driver, "/pushed")
     end
 
     it "returns the current URL when changed by replaceState" do
-      port = subject.instance_variable_get("@rack_server").port
-      subject.execute_script("window.history.replaceState({}, '', '/replaced')")
-      subject.current_url.should == "http://127.0.0.1:#{port}/replaced"
+      driver.execute_script("window.history.replaceState({}, '', '/replaced')")
+      driver.current_url.should == driver_url(driver, "/replaced")
     end
 
     it "does not double-encode URLs" do
-      subject.visit("/hello/world?success=%25true")
-      subject.current_url.should =~ /success=\%25true/
+      driver.visit("/hello/world?success=%25true")
+      driver.current_url.should =~ /success=\%25true/
     end
 
     it "visits a page with an anchor" do
-      subject.visit("/hello#display_none")
-      subject.current_url.should =~ /hello#display_none/
+      driver.visit("/hello#display_none")
+      driver.current_url.should =~ /hello#display_none/
     end
 
     it "returns the source code for the page" do
-      subject.source.should =~ %r{<html>.*greeting.*}m
+      driver.source.should =~ %r{<html>.*greeting.*}m
     end
 
     it "evaluates Javascript and returns a string" do
-      result = subject.evaluate_script(%<document.getElementById('greeting').innerText>)
+      result = driver.evaluate_script(%<document.getElementById('greeting').innerText>)
       result.should == "hello"
     end
 
     it "evaluates Javascript and returns an array" do
-      result = subject.evaluate_script(%<["hello", "world"]>)
+      result = driver.evaluate_script(%<["hello", "world"]>)
       result.should == %w(hello world)
     end
 
     it "evaluates Javascript and returns an int" do
-      result = subject.evaluate_script(%<123>)
+      result = driver.evaluate_script(%<123>)
       result.should == 123
     end
 
     it "evaluates Javascript and returns a float" do
-      result = subject.evaluate_script(%<1.5>)
+      result = driver.evaluate_script(%<1.5>)
       result.should == 1.5
     end
 
     it "evaluates Javascript and returns null" do
-      result = subject.evaluate_script(%<(function () {})()>)
+      result = driver.evaluate_script(%<(function () {})()>)
       result.should == nil
     end
 
     it "evaluates Javascript and returns an object" do
-      result = subject.evaluate_script(%<({ 'one' : 1 })>)
+      result = driver.evaluate_script(%<({ 'one' : 1 })>)
       result.should == { 'one' => 1 }
     end
 
     it "evaluates Javascript and returns true" do
-      result = subject.evaluate_script(%<true>)
+      result = driver.evaluate_script(%<true>)
       result.should === true
     end
 
     it "evaluates Javascript and returns false" do
-      result = subject.evaluate_script(%<false>)
+      result = driver.evaluate_script(%<false>)
       result.should === false
     end
 
     it "evaluates Javascript and returns an escaped string" do
-      result = subject.evaluate_script(%<'"'>)
+      result = driver.evaluate_script(%<'"'>)
       result.should === "\""
     end
 
     it "evaluates Javascript with multiple lines" do
-      result = subject.evaluate_script("[1,\n2]")
+      result = driver.evaluate_script("[1,\n2]")
       result.should == [1, 2]
     end
 
     it "executes Javascript" do
-      subject.execute_script(%<document.getElementById('greeting').innerHTML = 'yo'>)
-      subject.find("//p[contains(., 'yo')]").should_not be_empty
+      driver.execute_script(%<document.getElementById('greeting').innerHTML = 'yo'>)
+      driver.find("//p[contains(., 'yo')]").should_not be_empty
     end
 
     it "raises an error for failing Javascript" do
-      expect { subject.execute_script(%<invalid salad>) }.
-        to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError)
+      expect { driver.execute_script(%<invalid salad>) }.
+        to raise_error(Capybara::Webkit::InvalidResponseError)
     end
 
     it "doesn't raise an error for Javascript that doesn't return anything" do
-      lambda { subject.execute_script(%<(function () { "returns nothing" })()>) }.
+      lambda { driver.execute_script(%<(function () { "returns nothing" })()>) }.
         should_not raise_error
     end
 
     it "returns a node's tag name" do
-      subject.find("//p").first.tag_name.should == "p"
+      driver.find("//p").first.tag_name.should == "p"
     end
 
     it "reads disabled property" do
-      subject.find("//input").first.should be_disabled
+      driver.find("//input").first.should be_disabled
     end
 
     it "reads checked property" do
-      subject.find("//input[@id='checktest']").first.should be_checked
+      driver.find("//input[@id='checktest']").first.should be_checked
     end
 
     it "finds visible elements" do
-      subject.find("//p").first.should be_visible
-      subject.find("//*[@id='invisible']").first.should_not be_visible
+      driver.find("//p").first.should be_visible
+      driver.find("//*[@id='invisible']").first.should_not be_visible
     end
   end
 
   context "console messages app" do
-
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <head>
-            </head>
-            <body>
-              <script type="text/javascript">
-                console.log("hello");
-                console.log("hello again");
-                oops
-              </script>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <head>
+          </head>
+          <body>
+            <script type="text/javascript">
+              console.log("hello");
+              console.log("hello again");
+              oops
+            </script>
+          </body>
+        </html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     it "collects messages logged to the console" do
-      subject.console_messages.first.should include :source, :message => "hello", :line_number => 6
-      subject.console_messages.length.should eq 3
+      driver.console_messages.first.should include :source, :message => "hello", :line_number => 6
+      driver.console_messages.length.should eq 3
     end
 
     it "logs errors to the console" do
-      subject.error_messages.length.should eq 1
+      driver.error_messages.length.should eq 1
     end
 
   end
 
   context "form app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <form action="/" method="GET">
-              <input type="text" name="foo" value="bar"/>
-              <input type="text" name="maxlength_foo" value="bar" maxlength="10"/>
-              <input type="text" id="disabled_input" disabled="disabled"/>
-              <input type="checkbox" name="checkedbox" value="1" checked="checked"/>
-              <input type="checkbox" name="uncheckedbox" value="2"/>
-              <select name="animal">
-                <option id="select-option-monkey">Monkey</option>
-                <option id="select-option-capybara" selected="selected">Capybara</option>
-              </select>
-              <select name="toppings" multiple="multiple">
-                <optgroup label="Mediocre Toppings">
-                  <option selected="selected" id="topping-apple">Apple</option>
-                  <option selected="selected" id="topping-banana">Banana</option>
-                </optgroup>
-                <optgroup label="Best Toppings">
-                  <option selected="selected" id="topping-cherry">Cherry</option>
-                </optgroup>
-              </select>
-              <textarea id="only-textarea">what a wonderful area for text</textarea>
-              <input type="radio" id="only-radio" value="1"/>
-              <button type="reset">Reset Form</button>
-            </form>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
-    end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html><body>
+          <form action="/" method="GET">
+            <input type="text" name="foo" value="bar"/>
+            <input type="text" name="maxlength_foo" value="bar" maxlength="10"/>
+            <input type="text" id="disabled_input" disabled="disabled"/>
+            <input type="checkbox" name="checkedbox" value="1" checked="checked"/>
+            <input type="checkbox" name="uncheckedbox" value="2"/>
+            <select name="animal">
+              <option id="select-option-monkey">Monkey</option>
+              <option id="select-option-capybara" selected="selected">Capybara</option>
+            </select>
+            <select name="toppings" multiple="multiple">
+              <optgroup label="Mediocre Toppings">
+                <option selected="selected" id="topping-apple">Apple</option>
+                <option selected="selected" id="topping-banana">Banana</option>
+              </optgroup>
+              <optgroup label="Best Toppings">
+                <option selected="selected" id="topping-cherry">Cherry</option>
+              </optgroup>
+            </select>
+            <textarea id="only-textarea">what a wonderful area for text</textarea>
+            <input type="radio" id="only-radio" value="1"/>
+            <button type="reset">Reset Form</button>
+          </form>
+        </body></html>
+      HTML
+    end
+
+    before { driver.visit("/") }
 
     it "returns a textarea's value" do
-      subject.find("//textarea").first.value.should == "what a wonderful area for text"
+      driver.find("//textarea").first.value.should == "what a wonderful area for text"
     end
 
     it "returns a text input's value" do
-      subject.find("//input").first.value.should == "bar"
+      driver.find("//input").first.value.should == "bar"
     end
 
     it "returns a select's value" do
-      subject.find("//select").first.value.should == "Capybara"
+      driver.find("//select").first.value.should == "Capybara"
     end
 
     it "sets an input's value" do
-      input = subject.find("//input").first
+      input = driver.find("//input").first
       input.set("newvalue")
       input.value.should == "newvalue"
     end
 
     it "sets an input's value greater than the max length" do
-      input = subject.find("//input[@name='maxlength_foo']").first
+      input = driver.find("//input[@name='maxlength_foo']").first
       input.set("allegories (poems)")
       input.value.should == "allegories"
     end
 
     it "sets an input's value equal to the max length" do
-      input = subject.find("//input[@name='maxlength_foo']").first
+      input = driver.find("//input[@name='maxlength_foo']").first
       input.set("allegories")
       input.value.should == "allegories"
     end
 
     it "sets an input's value less than the max length" do
-      input = subject.find("//input[@name='maxlength_foo']").first
+      input = driver.find("//input[@name='maxlength_foo']").first
       input.set("poems")
       input.value.should == "poems"
     end
 
     it "sets an input's nil value" do
-      input = subject.find("//input").first
+      input = driver.find("//input").first
       input.set(nil)
       input.value.should == ""
     end
 
     it "sets a select's value" do
-      select = subject.find("//select").first
+      select = driver.find("//select").first
       select.set("Monkey")
       select.value.should == "Monkey"
     end
 
     it "sets a textarea's value" do
-      textarea = subject.find("//textarea").first
+      textarea = driver.find("//textarea").first
       textarea.set("newvalue")
       textarea.value.should == "newvalue"
     end
 
-    let(:monkey_option)   { subject.find("//option[@id='select-option-monkey']").first }
-    let(:capybara_option) { subject.find("//option[@id='select-option-capybara']").first }
-    let(:animal_select)   { subject.find("//select[@name='animal']").first }
-    let(:apple_option)    { subject.find("//option[@id='topping-apple']").first }
-    let(:banana_option)   { subject.find("//option[@id='topping-banana']").first }
-    let(:cherry_option)   { subject.find("//option[@id='topping-cherry']").first }
-    let(:toppings_select) { subject.find("//select[@name='toppings']").first }
-    let(:reset_button)    { subject.find("//button[@type='reset']").first }
+    let(:monkey_option)   { driver.find("//option[@id='select-option-monkey']").first }
+    let(:capybara_option) { driver.find("//option[@id='select-option-capybara']").first }
+    let(:animal_select)   { driver.find("//select[@name='animal']").first }
+    let(:apple_option)    { driver.find("//option[@id='topping-apple']").first }
+    let(:banana_option)   { driver.find("//option[@id='topping-banana']").first }
+    let(:cherry_option)   { driver.find("//option[@id='topping-cherry']").first }
+    let(:toppings_select) { driver.find("//select[@name='toppings']").first }
+    let(:reset_button)    { driver.find("//button[@type='reset']").first }
 
     context "a select element's selection has been changed" do
       before do
@@ -537,8 +554,8 @@ describe Capybara::Driver::Webkit do
       toppings_select.value.should include("Apple", "Banana", "Cherry")
     end
 
-    let(:checked_box) { subject.find("//input[@name='checkedbox']").first }
-    let(:unchecked_box) { subject.find("//input[@name='uncheckedbox']").first }
+    let(:checked_box) { driver.find("//input[@name='checkedbox']").first }
+    let(:unchecked_box) { driver.find("//input[@name='uncheckedbox']").first }
 
     it "knows a checked box is checked" do
       checked_box['checked'].should be_true
@@ -576,8 +593,8 @@ describe Capybara::Driver::Webkit do
       unchecked_box.should_not be_checked
     end
 
-    let(:enabled_input)  { subject.find("//input[@name='foo']").first }
-    let(:disabled_input) { subject.find("//input[@id='disabled_input']").first }
+    let(:enabled_input)  { driver.find("//input[@name='foo']").first }
+    let(:disabled_input) { driver.find("//input[@id='disabled_input']").first }
 
     it "knows a disabled input is disabled" do
       disabled_input['disabled'].should be_true
@@ -589,91 +606,84 @@ describe Capybara::Driver::Webkit do
   end
 
   context "dom events" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-
-          <html><body>
-            <a href='#' class='watch'>Link</a>
-            <ul id="events"></ul>
-            <script type="text/javascript">
-              var events = document.getElementById("events");
-              var recordEvent = function (event) {
-                var element = document.createElement("li");
-                element.innerHTML = event.type;
-                events.appendChild(element);
-              };
-
-              var elements = document.getElementsByClassName("watch");
-              for (var i = 0; i < elements.length; i++) {
-                var element = elements[i];
-                element.addEventListener("mousedown", recordEvent);
-                element.addEventListener("mouseup", recordEvent);
-                element.addEventListener("click", recordEvent);
-              }
-            </script>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
-    end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html><body>
+          <a href='#' class='watch'>Link</a>
+          <ul id="events"></ul>
+          <script type="text/javascript">
+            var events = document.getElementById("events");
+            var recordEvent = function (event) {
+              var element = document.createElement("li");
+              element.innerHTML = event.type;
+              events.appendChild(element);
+            };
+
+            var elements = document.getElementsByClassName("watch");
+            for (var i = 0; i < elements.length; i++) {
+              var element = elements[i];
+              element.addEventListener("mousedown", recordEvent);
+              element.addEventListener("mouseup", recordEvent);
+              element.addEventListener("click", recordEvent);
+            }
+          </script>
+        </body></html>
+      HTML
+    end
+
+    before { driver.visit("/") }
 
     it "triggers mouse events" do
-      subject.find("//a").first.click
-      subject.find("//li").map(&:text).should == %w(mousedown mouseup click)
+      driver.find("//a").first.click
+      driver.find("//li").map(&:text).should == %w(mousedown mouseup click)
     end
   end
 
   context "form events app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <form action="/" method="GET">
-              <input class="watch" type="email"/>
-              <input class="watch" type="number"/>
-              <input class="watch" type="password"/>
-              <input class="watch" type="search"/>
-              <input class="watch" type="tel"/>
-              <input class="watch" type="text"/>
-              <input class="watch" type="url"/>
-              <textarea class="watch"></textarea>
-              <input class="watch" type="checkbox"/>
-              <input class="watch" type="radio"/>
-            </form>
-            <ul id="events"></ul>
-            <script type="text/javascript">
-              var events = document.getElementById("events");
-              var recordEvent = function (event) {
-                var element = document.createElement("li");
-                element.innerHTML = event.type;
-                events.appendChild(element);
-              };
-
-              var elements = document.getElementsByClassName("watch");
-              for (var i = 0; i < elements.length; i++) {
-                var element = elements[i];
-                element.addEventListener("focus", recordEvent);
-                element.addEventListener("keydown", recordEvent);
-                element.addEventListener("keypress", recordEvent);
-                element.addEventListener("keyup", recordEvent);
-                element.addEventListener("input", recordEvent);
-                element.addEventListener("change", recordEvent);
-                element.addEventListener("blur", recordEvent);
-                element.addEventListener("mousedown", recordEvent);
-                element.addEventListener("mouseup", recordEvent);
-                element.addEventListener("click", recordEvent);
-              }
-            </script>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
-    end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html><body>
+          <form action="/" method="GET">
+            <input class="watch" type="email"/>
+            <input class="watch" type="number"/>
+            <input class="watch" type="password"/>
+            <input class="watch" type="search"/>
+            <input class="watch" type="tel"/>
+            <input class="watch" type="text"/>
+            <input class="watch" type="url"/>
+            <textarea class="watch"></textarea>
+            <input class="watch" type="checkbox"/>
+            <input class="watch" type="radio"/>
+          </form>
+          <ul id="events"></ul>
+          <script type="text/javascript">
+            var events = document.getElementById("events");
+            var recordEvent = function (event) {
+              var element = document.createElement("li");
+              element.innerHTML = event.type;
+              events.appendChild(element);
+            };
+
+            var elements = document.getElementsByClassName("watch");
+            for (var i = 0; i < elements.length; i++) {
+              var element = elements[i];
+              element.addEventListener("focus", recordEvent);
+              element.addEventListener("keydown", recordEvent);
+              element.addEventListener("keypress", recordEvent);
+              element.addEventListener("keyup", recordEvent);
+              element.addEventListener("input", recordEvent);
+              element.addEventListener("change", recordEvent);
+              element.addEventListener("blur", recordEvent);
+              element.addEventListener("mousedown", recordEvent);
+              element.addEventListener("mouseup", recordEvent);
+              element.addEventListener("click", recordEvent);
+            }
+          </script>
+        </body></html>
+      HTML
+    end
+
+    before { driver.visit("/") }
 
     let(:newtext) { 'newvalue' }
 
@@ -685,171 +695,165 @@ describe Capybara::Driver::Webkit do
 
     %w(email number password search tel text url).each do | field_type |
       it "triggers text input events on inputs of type #{field_type}" do
-        subject.find("//input[@type='#{field_type}']").first.set(newtext)
-        subject.find("//li").map(&:text).should == keyevents
+        driver.find("//input[@type='#{field_type}']").first.set(newtext)
+        driver.find("//li").map(&:text).should == keyevents
       end
     end
 
     it "triggers textarea input events" do
-      subject.find("//textarea").first.set(newtext)
-      subject.find("//li").map(&:text).should == keyevents
+      driver.find("//textarea").first.set(newtext)
+      driver.find("//li").map(&:text).should == keyevents
     end
 
     it "triggers radio input events" do
-      subject.find("//input[@type='radio']").first.set(true)
-      subject.find("//li").map(&:text).should == %w(mousedown mouseup change click)
+      driver.find("//input[@type='radio']").first.set(true)
+      driver.find("//li").map(&:text).should == %w(mousedown mouseup change click)
     end
 
     it "triggers checkbox events" do
-      subject.find("//input[@type='checkbox']").first.set(true)
-      subject.find("//li").map(&:text).should == %w(mousedown mouseup change click)
+      driver.find("//input[@type='checkbox']").first.set(true)
+      driver.find("//li").map(&:text).should == %w(mousedown mouseup change click)
     end
   end
 
   context "mouse app" do
-    before(:all) do
-      @app =lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <div id="change">Change me</div>
-            <div id="mouseup">Push me</div>
-            <div id="mousedown">Release me</div>
-            <form action="/" method="GET">
-              <select id="change_select" name="change_select">
-                <option value="1" id="option-1" selected="selected">one</option>
-                <option value="2" id="option-2">two</option>
-              </select>
-            </form>
-            <script type="text/javascript">
-              document.getElementById("change_select").
-                addEventListener("change", function () {
-                  this.className = "triggered";
-                });
-              document.getElementById("change").
-                addEventListener("change", function () {
-                  this.className = "triggered";
-                });
-              document.getElementById("mouseup").
-                addEventListener("mouseup", function () {
-                  this.className = "triggered";
-                });
-              document.getElementById("mousedown").
-                addEventListener("mousedown", function () {
-                  this.className = "triggered";
-                });
-            </script>
-            <a href="/next">Next</a>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
-    end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html><body>
+          <div id="change">Change me</div>
+          <div id="mouseup">Push me</div>
+          <div id="mousedown">Release me</div>
+          <form action="/" method="GET">
+            <select id="change_select" name="change_select">
+              <option value="1" id="option-1" selected="selected">one</option>
+              <option value="2" id="option-2">two</option>
+            </select>
+          </form>
+          <script type="text/javascript">
+            document.getElementById("change_select").
+              addEventListener("change", function () {
+                this.className = "triggered";
+              });
+            document.getElementById("change").
+              addEventListener("change", function () {
+                this.className = "triggered";
+              });
+            document.getElementById("mouseup").
+              addEventListener("mouseup", function () {
+                this.className = "triggered";
+              });
+            document.getElementById("mousedown").
+              addEventListener("mousedown", function () {
+                this.className = "triggered";
+              });
+          </script>
+          <a href="/next">Next</a>
+        </body></html>
+      HTML
+    end
+
+    before { driver.visit("/") }
 
     it "clicks an element" do
-      subject.find("//a").first.click
-      subject.current_url =~ %r{/next$}
+      driver.find("//a").first.click
+      driver.current_url =~ %r{/next$}
     end
 
     it "fires a mouse event" do
-      subject.find("//*[@id='mouseup']").first.trigger("mouseup")
-      subject.find("//*[@class='triggered']").should_not be_empty
+      driver.find("//*[@id='mouseup']").first.trigger("mouseup")
+      driver.find("//*[@class='triggered']").should_not be_empty
     end
 
     it "fires a non-mouse event" do
-      subject.find("//*[@id='change']").first.trigger("change")
-      subject.find("//*[@class='triggered']").should_not be_empty
+      driver.find("//*[@id='change']").first.trigger("change")
+      driver.find("//*[@class='triggered']").should_not be_empty
     end
 
     it "fires a change on select" do
-      select = subject.find("//select").first
+      select = driver.find("//select").first
       select.value.should == "1"
-      option = subject.find("//option[@id='option-2']").first
+      option = driver.find("//option[@id='option-2']").first
       option.select_option
       select.value.should == "2"
-      subject.find("//select[@class='triggered']").should_not be_empty
+      driver.find("//select[@class='triggered']").should_not be_empty
     end
 
     it "fires drag events" do
-      draggable = subject.find("//*[@id='mousedown']").first
-      container = subject.find("//*[@id='mouseup']").first
+      draggable = driver.find("//*[@id='mousedown']").first
+      container = driver.find("//*[@id='mouseup']").first
 
       draggable.drag_to(container)
 
-      subject.find("//*[@class='triggered']").size.should == 1
+      driver.find("//*[@class='triggered']").size.should == 1
     end
   end
 
   context "nesting app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <div id="parent">
-              <div class="find">Expected</div>
-            </div>
-            <div class="find">Unexpected</div>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html><body>
+          <div id="parent">
+            <div class="find">Expected</div>
+          </div>
+          <div class="find">Unexpected</div>
+        </body></html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     it "evaluates nested xpath expressions" do
-      parent = subject.find("//*[@id='parent']").first
+      parent = driver.find("//*[@id='parent']").first
       parent.find("./*[@class='find']").map(&:text).should == %w(Expected)
     end
   end
 
   context "slow app" do
-    before(:all) do
-      @result = ""
-      @app = lambda do |env|
-        if env["PATH_INFO"] == "/result"
+    it "waits for a request to load" do
+      result = ""
+      driver = driver_for_app do
+        get "/result" do
           sleep(0.5)
-          @result << "finished"
+          result << "finished"
+          ""
         end
-        body = %{<html><body><a href="/result">Go</a></body></html>}
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
-    end
 
-    it "waits for a request to load" do
-      subject.find("//a").first.click
-      @result.should == "finished"
+        get "/" do
+          %{<html><body><a href="/result">Go</a></body></html>}
+        end
+      end
+      driver.visit("/")
+      driver.find("//a").first.click
+      result.should == "finished"
     end
   end
 
   context "error app" do
-    before(:all) do
-      @app = lambda do |env|
-        if env['PATH_INFO'] == "/error"
-          [404, {}, []]
-        else
-          body = <<-HTML
+    let(:driver) do
+      driver_for_app do
+        get "/error" do
+          invalid_response
+        end
+
+        get "/" do
+          <<-HTML
             <html><body>
               <form action="/error"><input type="submit"/></form>
             </body></html>
           HTML
-          [200,
-            { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-            [body]]
         end
       end
     end
 
+    before { driver.visit("/") }
+
     it "raises a webkit error for the requested url" do
       expect {
-        subject.find("//input").first.click
+        driver.find("//input").first.click
         wait_for_error_to_complete
-        subject.find("//body")
+        driver.find("//body")
       }.
-        to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError, %r{/error})
+        to raise_error(Capybara::Webkit::InvalidResponseError, %r{/error})
     end
 
     def wait_for_error_to_complete
@@ -858,171 +862,167 @@ describe Capybara::Driver::Webkit do
   end
 
   context "slow error app" do
-    before(:all) do
-      @app = lambda do |env|
-        if env['PATH_INFO'] == "/error"
-          body = "error"
+    let(:driver) do
+      driver_for_app do
+        get "/error" do
           sleep(1)
-          [304, {}, []]
-        else
-          body = <<-HTML
+          invalid_response
+        end
+
+        get "/" do
+          <<-HTML
             <html><body>
               <form action="/error"><input type="submit"/></form>
               <p>hello</p>
             </body></html>
           HTML
-          [200,
-            { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-            [body]]
         end
       end
     end
 
+    before { driver.visit("/") }
+
     it "raises a webkit error and then continues" do
-      subject.find("//input").first.click
-      expect { subject.find("//p") }.to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError)
-      subject.visit("/")
-      subject.find("//p").first.text.should == "hello"
+      driver.find("//input").first.click
+      expect { driver.find("//p") }.to raise_error(Capybara::Webkit::InvalidResponseError)
+      driver.visit("/")
+      driver.find("//p").first.text.should == "hello"
     end
   end
 
   context "popup app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <script type="text/javascript">
-              alert("alert");
-              confirm("confirm");
-              prompt("prompt");
-            </script>
-            <p>success</p>
-          </body></html>
-        HTML
-        sleep(0.5)
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
+    let(:driver) do
+      driver_for_app do
+        get "/" do
+          sleep(0.5)
+          return <<-HTML
+            <html><body>
+              <script type="text/javascript">
+                alert("alert");
+                confirm("confirm");
+                prompt("prompt");
+              </script>
+              <p>success</p>
+            </body></html>
+          HTML
+        end
       end
     end
 
+    before { driver.visit("/") }
+
     it "doesn't crash from alerts" do
-      subject.find("//p").first.text.should == "success"
+      driver.find("//p").first.text.should == "success"
     end
   end
 
   context "custom header" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <p id="user-agent">#{env['HTTP_USER_AGENT']}</p>
-            <p id="x-capybara-webkit-header">#{env['HTTP_X_CAPYBARA_WEBKIT_HEADER']}</p>
-            <p id="accept">#{env['HTTP_ACCEPT']}</p>
-            <a href="/">/</a>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
+    let(:driver) do
+      driver_for_app do
+        get "/" do
+          <<-HTML
+            <html><body>
+              <p id="user-agent">#{env['HTTP_USER_AGENT']}</p>
+              <p id="x-capybara-webkit-header">#{env['HTTP_X_CAPYBARA_WEBKIT_HEADER']}</p>
+              <p id="accept">#{env['HTTP_ACCEPT']}</p>
+              <a href="/">/</a>
+            </body></html>
+          HTML
+        end
       end
     end
 
+    before { driver.visit("/") }
+
     before do
-      subject.header('user-agent', 'capybara-webkit/custom-user-agent')
-      subject.header('x-capybara-webkit-header', 'x-capybara-webkit-header')
-      subject.header('accept', 'text/html')
-      subject.visit('/')
+      driver.header('user-agent', 'capybara-webkit/custom-user-agent')
+      driver.header('x-capybara-webkit-header', 'x-capybara-webkit-header')
+      driver.header('accept', 'text/html')
+      driver.visit('/')
     end
 
     it "can set user_agent" do
-      subject.find('id("user-agent")').first.text.should == 'capybara-webkit/custom-user-agent'
-      subject.evaluate_script('navigator.userAgent').should == 'capybara-webkit/custom-user-agent'
+      driver.find('id("user-agent")').first.text.should == 'capybara-webkit/custom-user-agent'
+      driver.evaluate_script('navigator.userAgent').should == 'capybara-webkit/custom-user-agent'
     end
 
     it "keep user_agent in next page" do
-      subject.find("//a").first.click
-      subject.find('id("user-agent")').first.text.should == 'capybara-webkit/custom-user-agent'
-      subject.evaluate_script('navigator.userAgent').should == 'capybara-webkit/custom-user-agent'
+      driver.find("//a").first.click
+      driver.find('id("user-agent")').first.text.should == 'capybara-webkit/custom-user-agent'
+      driver.evaluate_script('navigator.userAgent').should == 'capybara-webkit/custom-user-agent'
     end
 
     it "can set custom header" do
-      subject.find('id("x-capybara-webkit-header")').first.text.should == 'x-capybara-webkit-header'
+      driver.find('id("x-capybara-webkit-header")').first.text.should == 'x-capybara-webkit-header'
     end
 
     it "can set Accept header" do
-      subject.find('id("accept")').first.text.should == 'text/html'
+      driver.find('id("accept")').first.text.should == 'text/html'
     end
 
     it "can reset all custom header" do
-      subject.reset!
-      subject.visit('/')
-      subject.find('id("user-agent")').first.text.should_not == 'capybara-webkit/custom-user-agent'
-      subject.evaluate_script('navigator.userAgent').should_not == 'capybara-webkit/custom-user-agent'
-      subject.find('id("x-capybara-webkit-header")').first.text.should be_empty
-      subject.find('id("accept")').first.text.should_not == 'text/html'
+      driver.reset!
+      driver.visit('/')
+      driver.find('id("user-agent")').first.text.should_not == 'capybara-webkit/custom-user-agent'
+      driver.evaluate_script('navigator.userAgent').should_not == 'capybara-webkit/custom-user-agent'
+      driver.find('id("x-capybara-webkit-header")').first.text.should be_empty
+      driver.find('id("accept")').first.text.should_not == 'text/html'
     end
   end
 
   context "no response app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <form action="/error"><input type="submit"/></form>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html><body>
+          <form action="/error"><input type="submit"/></form>
+        </body></html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     it "raises a webkit error for the requested url" do
       make_the_server_go_away
       expect {
-        subject.find("//body")
+        driver.find("//body")
       }.
-       to raise_error(Capybara::Driver::Webkit::WebkitNoResponseError, %r{response})
+       to raise_error(Capybara::Webkit::NoResponseError, %r{response})
       make_the_server_come_back
     end
 
     def make_the_server_come_back
-      subject.browser.instance_variable_get(:@connection).unstub!(:gets)
-      subject.browser.instance_variable_get(:@connection).unstub!(:puts)
-      subject.browser.instance_variable_get(:@connection).unstub!(:print)
+      driver.browser.instance_variable_get(:@connection).unstub!(:gets)
+      driver.browser.instance_variable_get(:@connection).unstub!(:puts)
+      driver.browser.instance_variable_get(:@connection).unstub!(:print)
     end
 
     def make_the_server_go_away
-      subject.browser.instance_variable_get(:@connection).stub!(:gets).and_return(nil)
-      subject.browser.instance_variable_get(:@connection).stub!(:puts)
-      subject.browser.instance_variable_get(:@connection).stub!(:print)
+      driver.browser.instance_variable_get(:@connection).stub!(:gets).and_return(nil)
+      driver.browser.instance_variable_get(:@connection).stub!(:puts)
+      driver.browser.instance_variable_get(:@connection).stub!(:print)
     end
   end
 
   context "custom font app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <head>
-              <style type="text/css">
-                p { font-family: "Verdana"; }
-              </style>
-            </head>
-            <body>
-              <p id="text">Hello</p>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <head>
+            <style type="text/css">
+              p { font-family: "Verdana"; }
+            </style>
+          </head>
+          <body>
+            <p id="text">Hello</p>
+          </body>
+        </html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     it "ignores custom fonts" do
-      font_family = subject.evaluate_script(<<-SCRIPT)
+      font_family = driver.evaluate_script(<<-SCRIPT)
         var element = document.getElementById("text");
         element.ownerDocument.defaultView.getComputedStyle(element, null).getPropertyValue("font-family");
       SCRIPT
@@ -1031,49 +1031,45 @@ describe Capybara::Driver::Webkit do
   end
 
   context "cookie-based app" do
-    before(:all) do
-      @cookie = 'cookie=abc; domain=127.0.0.1; path=/'
-      @app = lambda do |env|
-        request = ::Rack::Request.new(env)
-
-        body = <<-HTML
-          <html><body>
-            <p id="cookie">#{request.cookies["cookie"] || ""}</p>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type'   => 'text/html; charset=UTF-8',
-            'Content-Length' => body.length.to_s,
-            'Set-Cookie'     => @cookie,
-          },
-          [body]]
+    let(:driver) do
+      driver_for_app do
+        get "/" do
+          headers 'Set-Cookie' => 'cookie=abc; domain=127.0.0.1; path=/'
+          <<-HTML
+            <html><body>
+              <p id="cookie">#{request.cookies["cookie"] || ""}</p>
+            </body></html>
+          HTML
+        end
       end
     end
 
+    before { driver.visit("/") }
+
     def echoed_cookie
-      subject.find('id("cookie")').first.text
+      driver.find('id("cookie")').first.text
     end
 
     it "remembers the cookie on second visit" do
       echoed_cookie.should == ""
-      subject.visit "/"
+      driver.visit "/"
       echoed_cookie.should == "abc"
     end
 
     it "uses a custom cookie" do
-      subject.browser.set_cookie @cookie
-      subject.visit "/"
+      driver.browser.set_cookie 'cookie=abc; domain=127.0.0.1; path=/'
+      driver.visit "/"
       echoed_cookie.should == "abc"
     end
 
     it "clears cookies" do
-      subject.browser.clear_cookies
-      subject.visit "/"
+      driver.browser.clear_cookies
+      driver.visit "/"
       echoed_cookie.should == ""
     end
 
     it "allows enumeration of cookies" do
-      cookies = subject.browser.get_cookies
+      cookies = driver.browser.get_cookies
 
       cookies.size.should == 1
 
@@ -1084,64 +1080,23 @@ describe Capybara::Driver::Webkit do
     end
 
     it "allows reading access to cookies using a nice syntax" do
-      subject.cookies["cookie"].should == "abc"
-    end
-  end
-
-  context "with socket debugger" do
-    let(:socket_debugger_class){ Capybara::Driver::Webkit::SocketDebugger }
-    let(:browser_with_debugger){
-      connection = Capybara::Driver::Webkit::Connection.new(:socket_class => socket_debugger_class)
-      Capybara::Driver::Webkit::Browser.new(connection)
-    }
-    let(:driver_with_debugger){ Capybara::Driver::Webkit.new(@app, :browser => browser_with_debugger) }
-
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html><body>
-            <div id="parent">
-              <div class="find">Expected</div>
-            </div>
-            <div class="find">Unexpected</div>
-          </body></html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
-    end
-
-    it "prints out sent content" do
-      socket_debugger_class.any_instance.stub(:received){|content| content }
-      sent_content = ['Find', 1, 17, "//*[@id='parent']"]
-      socket_debugger_class.any_instance.should_receive(:sent).exactly(sent_content.size).times
-      driver_with_debugger.find("//*[@id='parent']")
-    end
-
-    it "prints out received content" do
-      socket_debugger_class.any_instance.stub(:sent)
-      socket_debugger_class.any_instance.should_receive(:received).at_least(:once).and_return("ok")
-      driver_with_debugger.find("//*[@id='parent']")
+      driver.cookies["cookie"].should == "abc"
     end
   end
 
   context "remove node app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <div id="parent">
-              <p id="removeMe">Hello</p>
-            </div>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <div id="parent">
+            <p id="removeMe">Hello</p>
+          </div>
+        </html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     before { set_automatic_reload false }
     after { set_automatic_reload true }
 
@@ -1152,58 +1107,55 @@ describe Capybara::Driver::Webkit do
     end
 
     it "allows removed nodes when reloading is disabled" do
-      node = subject.find("//p[@id='removeMe']").first
-      subject.evaluate_script("document.getElementById('parent').innerHTML = 'Magic'")
+      node = driver.find("//p[@id='removeMe']").first
+      driver.evaluate_script("document.getElementById('parent').innerHTML = 'Magic'")
       node.text.should == 'Hello'
     end
   end
 
   context "app with a lot of HTML tags" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <head>
-              <title>My eBook</title>
-              <meta class="charset" name="charset" value="utf-8" />
-              <meta class="author" name="author" value="Firstname Lastname" />
-            </head>
-            <body>
-              <div id="toc">
-                <table>
-                  <thead id="head">
-                    <tr><td class="td1">Chapter</td><td>Page</td></tr>
-                  </thead>
-                  <tbody>
-                    <tr><td>Intro</td><td>1</td></tr>
-                    <tr><td>Chapter 1</td><td class="td2">1</td></tr>
-                    <tr><td>Chapter 2</td><td>1</td></tr>
-                  </tbody>
-                </table>
-              </div>
-
-              <h1 class="h1">My first book</h1>
-              <p class="p1">Written by me</p>
-              <div id="intro" class="intro">
-                <p>Let's try out XPath</p>
-                <p class="p2">in capybara-webkit</p>
-              </div>
-
-              <h2 class="chapter1">Chapter 1</h2>
-              <p>This paragraph is fascinating.</p>
-              <p class="p3">But not as much as this one.</p>
-
-              <h2 class="chapter2">Chapter 2</h2>
-              <p>Let's try if we can select this</p>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <head>
+            <title>My eBook</title>
+            <meta class="charset" name="charset" value="utf-8" />
+            <meta class="author" name="author" value="Firstname Lastname" />
+          </head>
+          <body>
+            <div id="toc">
+              <table>
+                <thead id="head">
+                  <tr><td class="td1">Chapter</td><td>Page</td></tr>
+                </thead>
+                <tbody>
+                  <tr><td>Intro</td><td>1</td></tr>
+                  <tr><td>Chapter 1</td><td class="td2">1</td></tr>
+                  <tr><td>Chapter 2</td><td>1</td></tr>
+                </tbody>
+              </table>
+            </div>
+
+            <h1 class="h1">My first book</h1>
+            <p class="p1">Written by me</p>
+            <div id="intro" class="intro">
+              <p>Let's try out XPath</p>
+              <p class="p2">in capybara-webkit</p>
+            </div>
+
+            <h2 class="chapter1">Chapter 1</h2>
+            <p>This paragraph is fascinating.</p>
+            <p class="p3">But not as much as this one.</p>
+
+            <h2 class="chapter2">Chapter 2</h2>
+            <p>Let's try if we can select this</p>
+          </body>
+        </html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     it "builds up node paths correctly" do
       cases = {
         "//*[contains(@class, 'author')]"    => "/html/head/meta[2]",
@@ -1217,7 +1169,7 @@ describe Capybara::Driver::Webkit do
       }
 
       cases.each do |xpath, path|
-        nodes = subject.find(xpath)
+        nodes = driver.find(xpath)
         nodes.size.should == 1
         nodes[0].path.should == path
       end
@@ -1225,165 +1177,94 @@ describe Capybara::Driver::Webkit do
   end
 
   context "css overflow app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <head>
-              <style type="text/css">
-                #overflow { overflow: hidden }
-              </style>
-            </head>
-            <body>
-              <div id="overflow">Overflow</div>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <head>
+            <style type="text/css">
+              #overflow { overflow: hidden }
+            </style>
+          </head>
+          <body>
+            <div id="overflow">Overflow</div>
+          </body>
+        </html>
+      HTML
     end
 
+    before { driver.visit("/") }
+
     it "handles overflow hidden" do
-      subject.find("//div[@id='overflow']").first.text.should == "Overflow"
+      driver.find("//div[@id='overflow']").first.text.should == "Overflow"
     end
   end
 
   context "javascript redirect app" do
-    before(:all) do
-      @app = lambda do |env|
-        if env['PATH_INFO'] == '/redirect'
-          body = <<-HTML
+    let(:driver) do
+      driver_for_app do
+        get '/redirect' do
+          <<-HTML
             <html>
               <script type="text/javascript">
-                window.location = "/next";
+                window.location = "/";
               </script>
             </html>
           HTML
-        else
-          body = "<html><p>finished</p></html>"
         end
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
+
+        get '/' do
+          "<html><p>finished</p></html>"
+        end
       end
     end
 
     it "loads a page without error" do
       10.times do
-        subject.visit("/redirect")
-        subject.find("//p").first.text.should == "finished"
+        driver.visit("/redirect")
+        driver.find("//p").first.text.should == "finished"
       end
     end
   end
 
   context "localStorage works" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <body>
-              <span id='output'></span>
-              <script type="text/javascript">
-                if (typeof localStorage !== "undefined") {
-                  if (!localStorage.refreshCounter) {
-                    localStorage.refreshCounter = 0;
-                  }
-                  if (localStorage.refreshCounter++ > 0) {
-                    document.getElementById("output").innerHTML = "localStorage is enabled";
-                  }
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <body>
+            <span id='output'></span>
+            <script type="text/javascript">
+              if (typeof localStorage !== "undefined") {
+                if (!localStorage.refreshCounter) {
+                  localStorage.refreshCounter = 0;
                 }
-              </script>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
-    end
-
-    it "displays the message on subsequent page loads" do
-      subject.find("//span[contains(.,'localStorage is enabled')]").should be_empty
-      subject.visit "/"
-      subject.find("//span[contains(.,'localStorage is enabled')]").should_not be_empty
-    end
-  end
-
-  context "app with a lot of HTML tags" do
-    before(:all) do
-      @app = lambda do |env|
-        body = <<-HTML
-          <html>
-            <head>
-              <title>My eBook</title>
-              <meta class="charset" name="charset" value="utf-8" />
-              <meta class="author" name="author" value="Firstname Lastname" />
-            </head>
-            <body>
-              <div id="toc">
-                <table>
-                  <thead id="head">
-                    <tr><td class="td1">Chapter</td><td>Page</td></tr>
-                  </thead>
-                  <tbody>
-                    <tr><td>Intro</td><td>1</td></tr>
-                    <tr><td>Chapter 1</td><td class="td2">1</td></tr>
-                    <tr><td>Chapter 2</td><td>1</td></tr>
-                  </tbody>
-                </table>
-              </div>
-
-              <h1 class="h1">My first book</h1>
-              <p class="p1">Written by me</p>
-              <div id="intro" class="intro">
-                <p>Let's try out XPath</p>
-                <p class="p2">in capybara-webkit</p>
-              </div>
-
-              <h2 class="chapter1">Chapter 1</h2>
-              <p>This paragraph is fascinating.</p>
-              <p class="p3">But not as much as this one.</p>
-
-              <h2 class="chapter2">Chapter 2</h2>
-              <p>Let's try if we can select this</p>
-            </body>
-          </html>
-        HTML
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
-      end
+                if (localStorage.refreshCounter++ > 0) {
+                  document.getElementById("output").innerHTML = "localStorage is enabled";
+                }
+              }
+            </script>
+          </body>
+        </html>
+      HTML
     end
 
-    it "builds up node paths correctly" do
-      cases = {
-        "//*[contains(@class, 'author')]"    => "/html/head/meta[2]",
-        "//*[contains(@class, 'td1')]"       => "/html/body/div[@id='toc']/table/thead[@id='head']/tr/td[1]",
-        "//*[contains(@class, 'td2')]"       => "/html/body/div[@id='toc']/table/tbody/tr[2]/td[2]",
-        "//h1"                               => "/html/body/h1",
-        "//*[contains(@class, 'chapter2')]"  => "/html/body/h2[2]",
-        "//*[contains(@class, 'p1')]"        => "/html/body/p[1]",
-        "//*[contains(@class, 'p2')]"        => "/html/body/div[@id='intro']/p[2]",
-        "//*[contains(@class, 'p3')]"        => "/html/body/p[3]",
-      }
+    before { driver.visit("/") }
 
-      cases.each do |xpath, path|
-        nodes = subject.find(xpath)
-        nodes.size.should == 1
-        nodes[0].path.should == path
-      end
+    it "displays the message on subsequent page loads" do
+      driver.find("//span[contains(.,'localStorage is enabled')]").should be_empty
+      driver.visit "/"
+      driver.find("//span[contains(.,'localStorage is enabled')]").should_not be_empty
     end
   end
 
   context "form app with server-side handler" do
-    before(:all) do
-      @app = lambda do |env|
-        if env["REQUEST_METHOD"] == "POST"
-          body = "<html><body><p>Congrats!</p></body></html>"
-        else
-          body = <<-HTML
+    let(:driver) do
+      driver_for_app do
+        post "/" do
+          "<html><body><p>Congrats!</p></body></html>"
+        end
+
+        get "/" do
+          <<-HTML
             <html>
               <head><title>Form</title>
               <body>
@@ -1395,67 +1276,66 @@ describe Capybara::Driver::Webkit do
             </html>
           HTML
         end
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
       end
     end
 
+    before { driver.visit("/") }
+
     it "submits a form without clicking" do
-      subject.find("//form")[0].submit
-      subject.body.should include "Congrats"
+      driver.find("//form")[0].submit
+      driver.body.should include "Congrats"
     end
   end
 
-  def key_app_body(event)
-    body = <<-HTML
-        <html>
-          <head><title>Form</title></head>
-          <body>
-            <div id="charcode_value"></div>
-            <div id="keycode_value"></div>
-            <div id="which_value"></div>
-            <input type="text" id="charcode" name="charcode" on#{event}="setcharcode" />
-            <script type="text/javascript">
-              var element = document.getElementById("charcode")
-              element.addEventListener("#{event}", setcharcode);
-              function setcharcode(event) {
-                var element = document.getElementById("charcode_value");
-                element.innerHTML = event.charCode;
-                element = document.getElementById("keycode_value");
-                element.innerHTML = event.keyCode;
-                element = document.getElementById("which_value");
-                element.innerHTML = event.which;
-              }
-            </script>
-          </body>
-        </html>
-    HTML
-    body
+  def driver_for_key_body(event)
+    driver_for_app do
+      get "/" do
+        <<-HTML
+          <html>
+            <head><title>Form</title></head>
+            <body>
+              <div id="charcode_value"></div>
+              <div id="keycode_value"></div>
+              <div id="which_value"></div>
+              <input type="text" id="charcode" name="charcode" on#{event}="setcharcode" />
+              <script type="text/javascript">
+                var element = document.getElementById("charcode")
+                element.addEventListener("#{event}", setcharcode);
+                function setcharcode(event) {
+                  var element = document.getElementById("charcode_value");
+                  element.innerHTML = event.charCode;
+                  element = document.getElementById("keycode_value");
+                  element.innerHTML = event.keyCode;
+                  element = document.getElementById("which_value");
+                  element.innerHTML = event.which;
+                }
+              </script>
+            </body>
+          </html>
+        HTML
+      end
+    end
   end
 
   def charCode_for(character)
-    subject.find("//input")[0].set(character)
-    subject.find("//div[@id='charcode_value']")[0].text
+    driver.find("//input")[0].set(character)
+    driver.find("//div[@id='charcode_value']")[0].text
   end
 
   def keyCode_for(character)
-    subject.find("//input")[0].set(character)
-    subject.find("//div[@id='keycode_value']")[0].text
+    driver.find("//input")[0].set(character)
+    driver.find("//div[@id='keycode_value']")[0].text
   end
 
   def which_for(character)
-    subject.find("//input")[0].set(character)
-    subject.find("//div[@id='which_value']")[0].text
+    driver.find("//input")[0].set(character)
+    driver.find("//div[@id='which_value']")[0].text
   end
 
   context "keypress app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = key_app_body("keypress")
-        [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s }, [body]]
-      end
-    end
+    let(:driver) { driver_for_key_body "keypress" }
+
+    before { driver.visit("/") }
 
     it "returns the charCode for the keypressed" do
       charCode_for("a").should == "97"
@@ -1515,38 +1395,236 @@ describe Capybara::Driver::Webkit do
   end
 
   context "keydown app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = key_app_body("keydown")
-        [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s }, [body]]
-      end
-    end
+    let(:driver) { driver_for_key_body "keydown" }
+    before { driver.visit("/") }
     it_behaves_like "a keyupdown app"
   end
 
   context "keyup app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = key_app_body("keyup")
-        [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s }, [body]]
+    let(:driver) { driver_for_key_body "keyup" }
+    before { driver.visit("/") }
+    it_behaves_like "a keyupdown app"
+  end
+
+  context "null byte app" do
+    let(:driver) do
+      driver_for_html("Hello\0World")
+    end
+
+    before { driver.visit("/") }
+
+    it "should include all the bytes in the source" do
+      driver.source.should == "Hello\0World"
+    end
+  end
+
+  context "javascript new window app" do
+    let(:driver) do
+      driver_for_app do
+        get '/new_window' do
+          <<-HTML
+            <html>
+              <script type="text/javascript">
+                window.open('http://#{request.host_with_port}/?#{request.query_string}', 'myWindow');
+              </script>
+              <p>bananas</p>
+            </html>
+          HTML
+        end
+
+        get "/" do
+          sleep params['sleep'].to_i if params['sleep']
+          "<html><head><title>My New Window</title></head><body><p>finished</p></body></html>"
+        end
       end
     end
 
-    it_behaves_like "a keyupdown app"
+    before { driver.visit("/") }
+
+    it "has the expected text in the new window" do
+      driver.visit("/new_window")
+      driver.within_window(driver.window_handles.last) do
+        driver.find("//p").first.text.should == "finished"
+      end
+    end
+
+    it "waits for the new window to load" do
+      driver.visit("/new_window?sleep=1")
+      driver.within_window(driver.window_handles.last) do
+        driver.find("//p").first.text.should == "finished"
+      end
+    end
+
+    it "waits for the new window to load when the window location has changed" do
+      driver.visit("/new_window?sleep=2")
+      driver.execute_script("setTimeout(function() { window.location = 'about:blank' }, 1000)")
+      driver.within_window(driver.window_handles.last) do
+        driver.find("//p").first.text.should == "finished"
+      end
+    end
+
+    it "switches back to the original window" do
+      driver.visit("/new_window")
+      driver.within_window(driver.window_handles.last) { }
+      driver.find("//p").first.text.should == "bananas"
+    end
+
+    it "supports finding a window by name" do
+      driver.visit("/new_window")
+      driver.within_window('myWindow') do
+        driver.find("//p").first.text.should == "finished"
+      end
+    end
+
+    it "supports finding a window by title" do
+      driver.visit("/new_window?sleep=5")
+      driver.within_window('My New Window') do
+        driver.find("//p").first.text.should == "finished"
+      end
+    end
+
+    it "supports finding a window by url" do
+      driver.visit("/new_window?test")
+      driver.within_window(driver_url(driver, "/?test")) do
+        driver.find("//p").first.text.should == "finished"
+      end
+    end
+
+    it "raises an error if the window is not found" do
+      expect { driver.within_window('myWindowDoesNotExist') }.
+        to raise_error(Capybara::Webkit::InvalidResponseError)
+    end
+
+    it "has a number of window handles equal to the number of open windows" do
+      driver.window_handles.size.should == 1
+      driver.visit("/new_window")
+      driver.window_handles.size.should == 2
+    end
+
+    it "closes new windows on reset" do
+      driver.visit("/new_window")
+      last_handle = driver.window_handles.last
+      driver.reset!
+      driver.window_handles.should_not include(last_handle)
+    end
   end
 
-  context "null byte app" do
-    before(:all) do
-      @app = lambda do |env|
-        body = "Hello\0World"
-        [200,
-          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-          [body]]
+  it "preserves cookies across windows" do
+    session_id = '12345'
+    driver = driver_for_app do
+      get '/new_window' do
+        <<-HTML
+          <html>
+            <script type="text/javascript">
+              window.open('http://#{request.host_with_port}/set_cookie');
+            </script>
+          </html>
+        HTML
+      end
+
+      get '/set_cookie' do
+        response.set_cookie 'session_id', session_id
       end
     end
 
-    it "should include all the bytes in the source" do
-      subject.source.should == "Hello\0World"
+    driver.visit("/new_window")
+    driver.cookies['session_id'].should == session_id
+  end
+
+  context "timers app" do
+    let(:driver) do
+      driver_for_app do
+        get "/success" do
+          '<html><body></body></html>'
+        end
+
+        get "/not-found" do
+          404
+        end
+
+        get "/outer" do
+          <<-HTML
+            <html>
+              <head>
+                <script>
+                  function emit_true_load_finished(){var divTag = document.createElement("div");divTag.innerHTML = "<iframe src='/success'></iframe>";document.body.appendChild(divTag);};
+                  function emit_false_load_finished(){var divTag = document.createElement("div");divTag.innerHTML = "<iframe src='/not-found'></iframe>";document.body.appendChild(divTag);};
+                  function emit_false_true_load_finished() { emit_false_load_finished(); setTimeout('emit_true_load_finished()',100); };
+                </script>
+              </head>
+              <body onload="setTimeout('emit_false_true_load_finished()',100)">
+              </body>
+            </html>
+          HTML
+        end
+
+        get '/' do
+          "<html><body></body></html>"
+        end
+      end
     end
+
+    before { driver.visit("/") }
+
+    it "raises error for any loadFinished failure" do
+      expect do
+        driver.visit("/outer")
+        sleep 1
+        driver.find("//body")
+      end.to raise_error(Capybara::Webkit::InvalidResponseError)
+    end
+  end
+
+  describe "basic auth" do
+    let(:driver) do
+      driver_for_app do
+        get "/" do
+          if env["HTTP_AUTHORIZATION"]
+            env["HTTP_AUTHORIZATION"]
+          else
+            headers "WWW-Authenticate" => 'Basic realm="Secure Area"'
+            status 401
+            "401 Unauthorized."
+          end
+        end
+      end
+    end
+
+    it "can authenticate a request" do
+      driver.browser.authenticate('user', 'password')
+      driver.visit("/")
+      driver.body.should include("Basic "+Base64.encode64("user:password").strip)
+    end
+  end
+
+  describe "logger app" do
+    it "logs nothing before turning on the logger" do
+      driver.visit("/")
+      log.should == ""
+    end
+
+    it "logs its commands after turning on the logger" do
+      driver.enable_logging
+      driver.visit("/")
+      log.should_not == ""
+    end
+
+    let(:driver) do
+      command = "#{Capybara::Webkit::Connection::SERVER_PATH} 2>&1"
+      connection = Capybara::Webkit::Connection.new(:command => command, :stdout => output)
+      browser = Capybara::Webkit::Browser.new(connection)
+      Capybara::Webkit::Driver.new(AppRunner.app, :browser => browser)
+    end
+
+    let(:output) { StringIO.new }
+
+    def log
+      output.rewind
+      output.read
+    end
+  end
+
+  def driver_url(driver, path)
+    URI.parse(driver.current_url).merge(path).to_s
   end
 end