RubyGems - capybara-webkit - Versions diffs - 0.13.2 → 0.14.0 - Mend

capybara-webkit 0.13.2 → 0.14.0

Files changed (91) hide show

data/.travis.yml +10 -0
data/Gemfile.lock +20 -18
data/NEWS.md +20 -1
data/README.md +12 -10
data/capybara-webkit.gemspec +3 -2
data/lib/capybara/webkit/browser.rb +10 -19
data/lib/capybara/webkit/connection.rb +13 -34
data/lib/capybara/webkit/driver.rb +5 -22
data/lib/capybara/webkit/node.rb +10 -2
data/lib/capybara/webkit/version.rb +1 -1
data/lib/capybara_webkit_builder.rb +10 -1
data/spec/browser_spec.rb +1 -1
data/spec/connection_spec.rb +4 -2
data/spec/driver_rendering_spec.rb +2 -2
data/spec/driver_resize_window_spec.rb +29 -40
data/spec/driver_spec.rb +368 -125
data/spec/integration/session_spec.rb +100 -6
data/spec/spec_helper.rb +6 -9
data/spec/support/app_runner.rb +2 -12
data/src/Authenticate.cpp +2 -2
data/src/ClearCookies.cpp +1 -1
data/src/ClearPromptText.cpp +1 -1
data/src/Command.cpp +13 -0
data/src/Command.h +6 -0
data/src/CommandFactory.cpp +1 -3
data/src/Connection.cpp +4 -3
data/src/ConsoleMessages.cpp +4 -1
data/src/CurrentUrl.cpp +1 -16
data/src/CurrentUrl.h +0 -6
data/src/EnableLogging.cpp +1 -1
data/src/Evaluate.cpp +3 -74
data/src/Evaluate.h +0 -8
data/src/Execute.cpp +2 -2
data/src/Find.cpp +2 -2
data/src/FrameFocus.cpp +3 -3
data/src/GetCookies.cpp +1 -1
data/src/GetTimeout.cpp +1 -1
data/src/GetWindowHandle.cpp +1 -1
data/src/GetWindowHandles.cpp +6 -5
data/src/Header.cpp +2 -2
data/src/Headers.cpp +1 -1
data/src/IgnoreSslErrors.cpp +1 -1
data/src/JavascriptAlertMessages.cpp +4 -1
data/src/JavascriptConfirmMessages.cpp +4 -1
data/src/JavascriptPromptMessages.cpp +4 -1
data/src/JsonSerializer.cpp +116 -0
data/src/JsonSerializer.h +20 -0
data/src/NetworkAccessManager.cpp +58 -17
data/src/NetworkAccessManager.h +6 -0
data/src/NoOpReply.cpp +32 -0
data/src/NoOpReply.h +18 -0
data/src/Node.cpp +1 -1
data/src/NullCommand.cpp +1 -1
data/src/PageLoadingCommand.cpp +5 -4
data/src/Render.cpp +1 -1
data/src/Reset.cpp +1 -1
data/src/ResizeWindow.cpp +1 -1
data/src/Response.cpp +3 -3
data/src/Response.h +13 -4
data/src/SetConfirmAction.cpp +1 -1
data/src/SetCookie.cpp +1 -1
data/src/SetPromptAction.cpp +1 -1
data/src/SetPromptText.cpp +1 -1
data/src/SetProxy.cpp +2 -2
data/src/SetSkipImageLoading.cpp +1 -1
data/src/SetTimeout.cpp +2 -2
data/src/SetUrlBlacklist.cpp +15 -0
data/src/SetUrlBlacklist.h +11 -0
data/src/Status.cpp +1 -1
data/src/TimeoutCommand.cpp +6 -6
data/src/TimeoutCommand.h +0 -3
data/src/UnsupportedContentHandler.cpp +1 -4
data/src/Visit.cpp +1 -1
data/src/WebPage.cpp +41 -31
data/src/WebPage.h +14 -12
data/src/WebPageManager.cpp +13 -8
data/src/WebPageManager.h +3 -2
data/src/WindowFocus.cpp +2 -2
data/src/body.cpp +7 -2
data/src/capybara.js +10 -2
data/src/find_command.h +1 -3
data/src/webkit_server.pro +7 -7
metadata +47 -82
checksums.yaml +0 -7
data/spec/integration/driver_spec.rb +0 -21
data/src/RequestedUrl.cpp +0 -13
data/src/RequestedUrl.h +0 -10
data/src/Source.cpp +0 -19
data/src/Source.h +0 -18
data/src/Url.cpp +0 -13
data/src/Url.h +0 -10

data/lib/capybara/webkit/version.rb CHANGED

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

data/lib/capybara_webkit_builder.rb CHANGED

@@ -12,13 +12,22 @@ module CapybaraWebkitBuilder
   end
   def qmake_bin
-    ENV['QMAKE'] || 'qmake'
+    ENV['QMAKE'] || default_qmake_binary
   end
   def spec
     ENV['SPEC'] || os_spec
   end
+  def default_qmake_binary
+    case RbConfig::CONFIG['host_os']
+    when /freebsd/
+      "qmake-qt4"
+    else
+      "qmake"
+    end
+  end
   def os_spec
     case RbConfig::CONFIG['host_os']
     when /linux/

data/spec/browser_spec.rb CHANGED

@@ -231,7 +231,7 @@ describe Capybara::Webkit::Browser do
     end
     it 'uses original URL' do
-      browser.url.should == @url
+      browser.current_url.should == @url
     end
     it 'uses URLs changed by javascript' do

data/spec/connection_spec.rb CHANGED

@@ -3,7 +3,7 @@ require 'capybara/webkit/connection'
 describe Capybara::Webkit::Connection do
   it "boots a server to talk to" do
-    url = @rack_server.url("/")
+    url = "http://#{@rack_server.host}:#{@rack_server.port}/"
     connection.puts "Visit"
     connection.puts 1
     connection.puts url.to_s.bytesize
@@ -22,12 +22,14 @@ describe Capybara::Webkit::Connection do
     io = StringIO.new
     redirected_connection = Capybara::Webkit::Connection.new(:stdout => io)
     script = 'console.log("hello world")'
+    redirected_connection.puts "EnableLogging"
+    redirected_connection.puts 0
     redirected_connection.puts "Execute"
     redirected_connection.puts 1
     redirected_connection.puts script.to_s.bytesize
     redirected_connection.print script
     sleep(0.5)
-    io.string.should include "hello world\n"
+    io.string.should include "hello world \n"
   end
   it "returns the server port" do

data/spec/driver_rendering_spec.rb CHANGED

@@ -20,12 +20,12 @@ describe Capybara::Webkit::Driver, "rendering an image" do
     tmp_dir    = File.join(PROJECT_ROOT, 'tmp')
     FileUtils.mkdir_p tmp_dir
     @file_name = File.join(tmp_dir, 'render-test.png')
-    driver.visit '/'
+    driver.visit("#{AppRunner.app_host}/")
   end
   def render(options)
     FileUtils.rm_f @file_name
-    driver.render @file_name, options
+    driver.save_screenshot @file_name, options
     @image = MiniMagick::Image.open @file_name
   end

data/spec/driver_resize_window_spec.rb CHANGED

@@ -2,58 +2,47 @@ require 'spec_helper'
 require 'capybara/webkit/driver'
 describe Capybara::Webkit::Driver, "#resize_window(width, height)" do
-  before(:all) do
-    app = lambda do |env|
-      body = <<-HTML
-        <html>
-          <body>
-            <h1 id="dimentions">UNKNOWN</h1>
-            <script>
-              window.onload = window.onresize = function(){
-                document.getElementById("dimentions").innerHTML = "[" + window.innerWidth + "x" + window.innerHeight + "]";
-              };
-            </script>
-          </body>
-        </html>
-      HTML
-      [
-        200,
-        { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
-        [body]
-      ]
-    end
-    @driver = Capybara::Webkit::Driver.new(app, :browser => $webkit_browser)
+  include AppRunner
+  let(:driver) do
+    driver_for_html(<<-HTML)
+      <html>
+        <body>
+          <h1 id="dimentions">UNKNOWN</h1>
+          <script>
+            window.onload = window.onresize = function(){
+              document.getElementById("dimentions").innerHTML = "[" + window.innerWidth + "x" + window.innerHeight + "]";
+            };
+          </script>
+        </body>
+      </html>
+    HTML
   end
   DEFAULT_DIMENTIONS = "[1680x1050]"
   it "resizes the window to the specified size" do
-    @driver.visit("/")
+    driver.visit("#{AppRunner.app_host}/")
-    @driver.resize_window(800, 600)
-    @driver.body.should include("[800x600]")
+    driver.resize_window(800, 600)
+    driver.html.should include("[800x600]")
-    @driver.resize_window(300, 100)
-    @driver.body.should include("[300x100]")
+    driver.resize_window(300, 100)
+    driver.html.should include("[300x100]")
   end
   it "resizes the window to the specified size even before the document has loaded" do
-    @driver.resize_window(800, 600)
-    @driver.visit("/")
-    @driver.body.should include("[800x600]")
+    driver.resize_window(800, 600)
+    driver.visit("#{AppRunner.app_host}/")
+    driver.html.should include("[800x600]")
   end
   it "resets the window to the default size when the driver is reset" do
-    @driver.resize_window(800, 600)
-    @driver.reset!
-    @driver.visit("/")
-    @driver.body.should include(DEFAULT_DIMENTIONS)
+    driver.resize_window(800, 600)
+    driver.reset!
+    driver.visit("#{AppRunner.app_host}/")
+    driver.html.should include(DEFAULT_DIMENTIONS)
   end
-  after(:all) { @driver.reset! }
 end

data/spec/driver_spec.rb CHANGED

@@ -1,3 +1,5 @@
+# -*- encoding: UTF-8 -*-
 require 'spec_helper'
 require 'capybara/webkit/driver'
 require 'base64'
@@ -5,19 +7,37 @@ require 'base64'
 describe Capybara::Webkit::Driver do
   include AppRunner
+  def visit(url, driver=driver)
+    driver.visit("#{AppRunner.app_host}#{url}")
+  end
   context "iframe app" do
     let(:driver) do
       driver_for_app do
         get "/" do
-          if in_iframe_request?
-            p_id = "farewell"
-            msg  = "goodbye"
-            iframe = nil
+          if params[:iframe] == "true"
+            redirect '/iframe'
           else
-            p_id = "greeting"
-            msg  = "hello"
-            iframe = "<iframe id=\"f\" src=\"/?iframe=true\"></iframe>"
+            <<-HTML
+              <html>
+                <head>
+                  <style type="text/css">
+                    #display_none { display: none }
+                  </style>
+                </head>
+                <body>
+                  <iframe id="f" src="/?iframe=true"></iframe>
+                  <script type="text/javascript">
+                    document.write("<p id='greeting'>hello</p>");
+                  </script>
+                </body>
+              </html>
+            HTML
           end
+        end
+        get '/iframe' do
+          headers 'X-Redirected' => 'true'
           <<-HTML
             <html>
               <head>
@@ -26,23 +46,18 @@ describe Capybara::Webkit::Driver do
                 </style>
               </head>
               <body>
-                #{iframe}
                 <script type="text/javascript">
-                  document.write("<p id='#{p_id}'>#{msg}</p>");
+                  document.write("<p id='farewell'>goodbye</p>");
                 </script>
               </body>
             </html>
           HTML
         end
-        def in_iframe_request?
-          params[:iframe] == "true"
-        end
       end
     end
     before do
-      driver.visit("/")
+      visit("/")
     end
     it "finds frames by index" do
@@ -90,13 +105,7 @@ describe Capybara::Webkit::Driver do
     it "returns the current URL" do
       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
-      driver.within_frame("f") do
-        driver.source.should =~ %r{<html>.*farewell.*}m
+        driver.current_url.should == driver_url(driver, "/iframe")
       end
     end
@@ -113,6 +122,26 @@ describe Capybara::Webkit::Driver do
         driver.find("//p[contains(., 'yo')]").should_not be_empty
       end
     end
+    it "returns focus to parent" do
+      original_url = driver.current_url
+      driver.within_frame("f") {}
+      driver.current_url.should == original_url
+    end
+    it "returns the headers for the page" do
+      driver.within_frame("f") do
+        driver.response_headers['X-Redirected'].should == "true"
+      end
+    end
+    it "returns the status code for the page" do
+      driver.within_frame("f") do
+        driver.status_code.should == 200
+      end
+    end
   end
   context "error iframe app" do
@@ -135,15 +164,17 @@ describe Capybara::Webkit::Driver do
     end
     it "raises error whose message references the actual missing url" do
-      expect { driver.visit("/") }.to raise_error(Capybara::Webkit::InvalidResponseError, /inner-not-found/)
+      expect { visit("/") }.to raise_error(Capybara::Webkit::InvalidResponseError, /inner-not-found/)
     end
   end
   context "redirect app" do
     let(:driver) do
       driver_for_app do
+        enable :sessions
         get '/target' do
-          headers 'X-Redirected' => 'true'
+          headers 'X-Redirected' => (session.delete(:redirected) || false).to_s
           "<p>#{env['CONTENT_TYPE']}</p>"
         end
@@ -164,41 +195,49 @@ describe Capybara::Webkit::Driver do
         end
         get '/redirect-me' do
-          redirect '/target'
+          if session[:redirected]
+            redirect '/target'
+          else
+            session[:redirected] = true
+            redirect '/redirect-me'
+          end
         end
       end
     end
     it "should redirect without content type" do
-      driver.visit("/form")
+      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
-      driver.visit("/redirect-me")
+      visit("/redirect-me")
       driver.current_url.should == driver_url(driver, "/target")
       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
-      driver.visit("/redirect-me")
+      visit("/redirect-me")
       driver.current_url.should == driver_url(driver, "/target")
       driver.execute_script("window.history.replaceState({}, '', '/replaced-after-redirect')")
       driver.current_url.should == driver_url(driver, "/replaced-after-redirect")
     end
     it "should make headers available through response_headers" do
-      driver.visit('/redirect-me')
+      visit('/redirect-me')
       driver.response_headers['X-Redirected'].should == "true"
+      visit('/target')
+      driver.response_headers['X-Redirected'].should == "false"
     end
     it "should make the status code available through status_code" do
-      driver.visit('/redirect-me')
+      visit('/redirect-me')
+      driver.status_code.should == 200
+      visit('/target')
       driver.status_code.should == 200
     end
   end
   context "css app" do
@@ -211,15 +250,40 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "renders unsupported content types gracefully" do
-      driver.body.should =~ /css/
+      driver.html.should =~ /css/
     end
     it "sets the response headers with respect to the unsupported request" do
       driver.response_headers["Content-Type"].should == "text/css"
     end
+    it "does not wrap the content in HTML tags" do
+      driver.html.should_not =~ /<html>/
+    end
+  end
+  context "html app" do
+    let(:driver) do
+      driver_for_html(<<-HTML)
+        <html>
+          <head>
+            <title>Hello HTML</title>
+          </head>
+          <body>
+            <h1>This Is HTML!</h1>
+          </body>
+        </html>
+      HTML
+    end
+    before { visit("/") }
+    it "does not strip HTML tags" do
+      driver.html.should =~ /<html>/
+    end
   end
   context "hello app" do
@@ -250,12 +314,12 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "handles anchor tags" do
-      driver.visit("#test")
+      visit("#test")
       driver.find("//*[contains(., 'hello')]").should_not be_empty
-      driver.visit("#test")
+      visit("#test")
       driver.find("//*[contains(., 'hello')]").should_not be_empty
     end
@@ -295,7 +359,7 @@ describe Capybara::Webkit::Driver do
     end
     it "returns the current URL" do
-      driver.visit "/hello/world?success=true"
+      visit "/hello/world?success=true"
       driver.current_url.should == driver_url(driver, "/hello/world?success=true")
     end
@@ -310,19 +374,15 @@ describe Capybara::Webkit::Driver do
     end
     it "does not double-encode URLs" do
-      driver.visit("/hello/world?success=%25true")
+      visit("/hello/world?success=%25true")
       driver.current_url.should =~ /success=\%25true/
     end
     it "visits a page with an anchor" do
-      driver.visit("/hello#display_none")
+      visit("/hello#display_none")
       driver.current_url.should =~ /hello#display_none/
     end
-    it "returns the source code for the page" do
-      driver.source.should =~ %r{<html>.*greeting.*}m
-    end
     it "evaluates Javascript and returns a string" do
       result = driver.evaluate_script(%<document.getElementById('greeting').innerText>)
       result.should == "hello"
@@ -348,6 +408,11 @@ describe Capybara::Webkit::Driver do
       result.should == nil
     end
+    it "evaluates Infinity and returns null" do
+      result = driver.evaluate_script(%<Infinity>)
+      result.should == nil
+    end
     it "evaluates Javascript and returns an object" do
       result = driver.evaluate_script(%<({ 'one' : 1 })>)
       result.should == { 'one' => 1 }
@@ -412,11 +477,14 @@ describe Capybara::Webkit::Driver do
       driver_for_html(<<-HTML)
         <html>
           <head>
+          <meta http-equiv="content-type" content="text/html; charset=UTF-8">
           </head>
           <body>
             <script type="text/javascript">
               console.log("hello");
               console.log("hello again");
+              console.log("hello\\nnewline");
+              console.log("𝄞");
               oops
             </script>
           </body>
@@ -424,26 +492,40 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "collects messages logged to the console" do
       url = driver_url(driver, "/")
       message = driver.console_messages.first
       message.should include :source => url, :message => "hello"
-      # QtWebKit returns different line numbers depending on the version
-      [5, 6].should include(message[:line_number])
-      driver.console_messages.length.should eq 3
+      message[:line_number].should == 6
+      driver.console_messages.length.should eq 5
     end
     it "logs errors to the console" do
       driver.error_messages.length.should eq 1
     end
+    it "supports multi-line console messages" do
+      message = driver.console_messages[2]
+      message[:message].should == "hello\nnewline"
+    end
     it "empties the array when reset" do
       driver.reset!
       driver.console_messages.should be_empty
     end
+    it "supports console messages from an unknown source" do
+      driver.execute_script("console.log('hello')")
+      driver.console_messages.last[:message].should == 'hello'
+      driver.console_messages.last[:source].should be_nil
+      driver.console_messages.last[:line_number].should be_nil
+    end
+    it "escapes unicode console messages" do
+      driver.console_messages[3][:message].should == '𝄞'
+    end
   end
   context "javascript dialog interaction" do
@@ -455,17 +537,17 @@ describe Capybara::Webkit::Driver do
             </head>
             <body>
               <script type="text/javascript">
-                alert("Alert Text Goes Here");
+                alert("Alert Text\\nGoes Here");
               </script>
             </body>
           </html>
         HTML
       end
-      before { driver.visit("/") }
+      before { visit("/") }
       it "should let me read my alert messages" do
-        driver.alert_messages.first.should == "Alert Text Goes Here"
+        driver.alert_messages.first.should == "Alert Text\nGoes Here"
       end
       it "empties the array when reset" do
@@ -495,7 +577,7 @@ describe Capybara::Webkit::Driver do
         HTML
       end
-      before { driver.visit("/") }
+      before { visit("/") }
       it "should default to accept the confirm" do
         driver.find("//input").first.click
@@ -529,10 +611,16 @@ describe Capybara::Webkit::Driver do
       it "resets to the default of accepting confirms" do
         driver.dismiss_js_confirms!
         driver.reset!
-        driver.visit("/")
+        visit("/")
         driver.find("//input").first.click
         driver.console_messages.first[:message].should == "hello"
       end
+      it "supports multi-line confirmation messages" do
+        driver.execute_script("confirm('Hello\\nnewline')")
+        driver.confirm_messages.first.should == "Hello\nnewline"
+      end
     end
     context "on a prompt app" do
@@ -557,7 +645,7 @@ describe Capybara::Webkit::Driver do
         HTML
       end
-      before { driver.visit("/") }
+      before { visit("/") }
       it "should default to dismiss the prompt" do
         driver.find("//input").first.click
@@ -608,10 +696,16 @@ describe Capybara::Webkit::Driver do
       it "returns the prompt action to dismiss on reset" do
         driver.accept_js_prompts!
         driver.reset!
-        driver.visit("/")
+        visit("/")
         driver.find("//input").first.click
         driver.console_messages.first[:message].should == "goodbye"
       end
+      it "supports multi-line prompt messages" do
+        driver.execute_script("prompt('Hello\\nnewline')")
+        driver.prompt_messages.first.should == "Hello\nnewline"
+      end
     end
   end
@@ -650,7 +744,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "returns a textarea's value" do
       driver.find("//textarea").first.value.should == "what a wonderful area for text"
@@ -728,7 +822,7 @@ describe Capybara::Webkit::Driver do
       end
       it "does not modify the selected attribute of a new selection" do
-        monkey_option['selected'].should be_empty
+        monkey_option['selected'].should be_nil
       end
       it "returns the old value when a reset button is clicked" do
@@ -859,7 +953,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "triggers mouse events" do
       driver.find("//a").first.click
@@ -911,7 +1005,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     let(:newtext) { 'newvalue' }
@@ -980,7 +1074,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "clicks an element" do
       driver.find("//a").first.click
@@ -1028,7 +1122,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "evaluates nested xpath expressions" do
       parent = driver.find("//*[@id='parent']").first
@@ -1050,7 +1144,7 @@ describe Capybara::Webkit::Driver do
           %{<html><body><a href="/result">Go</a></body></html>}
         end
       end
-      driver.visit("/")
+      visit("/", driver)
       driver.find("//a").first.click
       result.should == "finished"
     end
@@ -1073,7 +1167,7 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "raises a webkit error for the requested url" do
       expect {
@@ -1108,12 +1202,12 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "raises a webkit error and then continues" do
       driver.find("//input").first.click
       expect { driver.find("//p") }.to raise_error(Capybara::Webkit::InvalidResponseError)
-      driver.visit("/")
+      visit("/")
       driver.find("//p").first.text.should == "hello"
     end
   end
@@ -1137,7 +1231,7 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "doesn't crash from alerts" do
       driver.find("//p").first.text.should == "success"
@@ -1160,13 +1254,13 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     before do
       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('/')
+      visit('/')
     end
     it "can set user_agent" do
@@ -1190,7 +1284,7 @@ describe Capybara::Webkit::Driver do
     it "can reset all custom header" do
       driver.reset!
-      driver.visit('/')
+      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
@@ -1207,7 +1301,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "raises a webkit error for the requested url" do
       make_the_server_go_away
@@ -1238,16 +1332,22 @@ describe Capybara::Webkit::Driver do
           <head>
             <style type="text/css">
               p { font-family: "Verdana"; }
+              p:before { font-family: "Verdana"; }
+              p:after { font-family: "Verdana"; }
+              #first-line-div:first-line { font-family: "Verdana"; }
+              #first-letter-div:first-letter { font-family: "Verdana"; }
             </style>
           </head>
           <body>
             <p id="text">Hello</p>
+            <p id="first-line-div">Hello first line.</p>
+            <p id="first-letter-div">Hello first letter.</p>
           </body>
         </html>
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "ignores custom fonts" do
       font_family = driver.evaluate_script(<<-SCRIPT)
@@ -1256,6 +1356,38 @@ describe Capybara::Webkit::Driver do
       SCRIPT
       font_family.should == "Arial"
     end
+    it "ignores custom fonts before an element" do
+      font_family = driver.evaluate_script(<<-SCRIPT)
+        var element = document.getElementById("text");
+        element.ownerDocument.defaultView.getComputedStyle(element, 'before').getPropertyValue("font-family");
+      SCRIPT
+      font_family.should == "Arial"
+    end
+    it "ignores custom fonts after an element" do
+      font_family = driver.evaluate_script(<<-SCRIPT)
+        var element = document.getElementById("text");
+        element.ownerDocument.defaultView.getComputedStyle(element, 'after').getPropertyValue("font-family");
+      SCRIPT
+      font_family.should == "Arial"
+    end
+    it "ignores custom fonts applied to the first-line pseudo element" do
+      font_family = driver.evaluate_script(<<-SCRIPT)
+        var element = document.getElementById("first-line-div");
+        element.ownerDocument.defaultView.getComputedStyle(element, 'first-line').getPropertyValue("font-family");
+      SCRIPT
+      font_family.should == "Arial"
+    end
+    it "ignores custom fonts applied to the first-letter pseudo element" do
+      font_family = driver.evaluate_script(<<-SCRIPT)
+        var element = document.getElementById("first-letter-div");
+        element.ownerDocument.defaultView.getComputedStyle(element, 'first-letter').getPropertyValue("font-family");
+      SCRIPT
+      font_family.should == "Arial"
+    end
   end
   context "cookie-based app" do
@@ -1272,7 +1404,7 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     def echoed_cookie
       driver.find('id("cookie")').first.text
@@ -1280,19 +1412,19 @@ describe Capybara::Webkit::Driver do
     it "remembers the cookie on second visit" do
       echoed_cookie.should == ""
-      driver.visit "/"
+      visit "/"
       echoed_cookie.should == "abc"
     end
     it "uses a custom cookie" do
       driver.browser.set_cookie 'cookie=abc; domain=127.0.0.1; path=/'
-      driver.visit "/"
+      visit "/"
       echoed_cookie.should == "abc"
     end
     it "clears cookies" do
       driver.browser.clear_cookies
-      driver.visit "/"
+      visit "/"
       echoed_cookie.should == ""
     end
@@ -1323,7 +1455,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     before { set_automatic_reload false }
     after { set_automatic_reload true }
@@ -1382,7 +1514,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "builds up node paths correctly" do
       cases = {
@@ -1420,7 +1552,7 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "handles overflow hidden" do
       driver.find("//div[@id='overflow']").first.text.should == "Overflow"
@@ -1448,7 +1580,7 @@ describe Capybara::Webkit::Driver do
     it "loads a page without error" do
       10.times do
-        driver.visit("/redirect")
+        visit("/redirect")
         driver.find("//p").first.text.should == "finished"
       end
     end
@@ -1475,11 +1607,11 @@ describe Capybara::Webkit::Driver do
       HTML
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "displays the message on subsequent page loads" do
       driver.find("//span[contains(.,'localStorage is enabled')]").should be_empty
-      driver.visit "/"
+      visit "/"
       driver.find("//span[contains(.,'localStorage is enabled')]").should_not be_empty
     end
   end
@@ -1507,11 +1639,11 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "submits a form without clicking" do
       driver.find("//form")[0].submit
-      driver.body.should include "Congrats"
+      driver.html.should include "Congrats"
     end
   end
@@ -1563,7 +1695,7 @@ describe Capybara::Webkit::Driver do
   context "keypress app" do
     let(:driver) { driver_for_key_body "keypress" }
-    before { driver.visit("/") }
+    before { visit("/") }
     it "returns the charCode for the keypressed" do
       charCode_for("a").should == "97"
@@ -1624,28 +1756,16 @@ describe Capybara::Webkit::Driver do
   context "keydown app" do
     let(:driver) { driver_for_key_body "keydown" }
-    before { driver.visit("/") }
+    before { visit("/") }
     it_behaves_like "a keyupdown app"
   end
   context "keyup app" do
     let(:driver) { driver_for_key_body "keyup" }
-    before { driver.visit("/") }
+    before { 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
@@ -1667,24 +1787,24 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "has the expected text in the new window" do
-      driver.visit("/new_window")
+      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")
+      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")
+      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"
@@ -1692,27 +1812,27 @@ describe Capybara::Webkit::Driver do
     end
     it "switches back to the original window" do
-      driver.visit("/new_window")
+      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")
+      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")
+      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")
+      visit("/new_window?test")
       driver.within_window(driver_url(driver, "/?test")) do
         driver.find("//p").first.text.should == "finished"
       end
@@ -1725,12 +1845,12 @@ describe Capybara::Webkit::Driver do
     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")
+      visit("/new_window")
       driver.window_handles.size.should == 2
     end
     it "closes new windows on reset" do
-      driver.visit("/new_window")
+      visit("/new_window")
       last_handle = driver.window_handles.last
       driver.reset!
       driver.window_handles.should_not include(last_handle)
@@ -1755,7 +1875,7 @@ describe Capybara::Webkit::Driver do
       end
     end
-    driver.visit("/new_window")
+    visit("/new_window", driver)
     driver.cookies['session_id'].should == session_id
   end
@@ -1792,11 +1912,11 @@ describe Capybara::Webkit::Driver do
       end
     end
-    before { driver.visit("/") }
+    before { visit("/") }
     it "raises error for any loadFinished failure" do
       expect do
-        driver.visit("/outer")
+        visit("/outer")
         sleep 1
         driver.find("//body")
       end.to raise_error(Capybara::Webkit::InvalidResponseError)
@@ -1807,7 +1927,7 @@ describe Capybara::Webkit::Driver do
     let(:driver) do
       driver_for_app do
         get "/" do
-          if env["HTTP_AUTHORIZATION"]
+          if env["HTTP_AUTHORIZATION"] == "Basic #{Base64.encode64("user:password").strip}"
             env["HTTP_AUTHORIZATION"]
           else
             headers "WWW-Authenticate" => 'Basic realm="Secure Area"'
@@ -1820,8 +1940,95 @@ describe Capybara::Webkit::Driver do
     it "can authenticate a request" do
       driver.browser.authenticate('user', 'password')
-      driver.visit("/")
-      driver.body.should include("Basic "+Base64.encode64("user:password").strip)
+      visit("/")
+      driver.html.should include("Basic "+Base64.encode64("user:password").strip)
+    end
+    it "returns 401 for incorrectly authenticated request" do
+      driver.browser.authenticate('user1', 'password1')
+      driver.browser.timeout = 2
+      lambda { visit("/") }.should_not raise_error(Timeout::Error)
+      driver.status_code.should == 401
+    end
+    it "returns 401 for unauthenticated request" do
+      driver.browser.timeout = 2
+      lambda { visit("/") }.should_not raise_error(Timeout::Error)
+      driver.status_code.should == 401
+    end
+  end
+  describe "url blacklisting" do
+    let(:driver) do
+      driver_for_app do
+        get "/" do
+          <<-HTML
+          <html>
+            <body>
+              <script src="/script"></script>
+              <iframe src="http://example.com/path" id="frame1"></iframe>
+              <iframe src="http://example.org/path/to/file" id="frame2"></iframe>
+              <iframe src="/frame" id="frame3"></iframe>
+            </body>
+          </html>
+          HTML
+        end
+        get "/frame" do
+          <<-HTML
+          <html>
+            <body>
+              <p>Inner</p>
+            </body>
+          </html>
+          HTML
+        end
+        get "/script" do
+          <<-JS
+          document.write('<p>Script Run</p>')
+          JS
+        end
+      end
+    end
+    before do
+      driver.browser.url_blacklist = ["http://example.org/path/to/file",
+                                      "http://example.com",
+                                      "#{AppRunner.app_host}/script"]
+    end
+    it "should not fetch urls blocked by host" do
+      visit("/")
+      driver.within_frame('frame1') do
+        driver.find("//body").first.text.should be_empty
+      end
+    end
+    it "should not fetch urls blocked by path" do
+      visit('/')
+      driver.within_frame('frame2') do
+        driver.find("//body").first.text.should be_empty
+      end
+    end
+    it "should not fetch blocked scripts" do
+      visit("/")
+      driver.html.should_not include("Script Run")
+    end
+    it "should fetch unblocked urls" do
+      visit('/')
+      driver.within_frame('frame3') do
+        driver.find("//p").first.text.should == "Inner"
+      end
+    end
+    it "returns a status code for blocked urls" do
+      visit("/")
+      driver.within_frame('frame1') do
+        driver.status_code.should == 200
+      end
     end
   end
@@ -1852,41 +2059,41 @@ describe Capybara::Webkit::Driver do
     it "should not raise a timeout error when zero" do
       driver.browser.timeout = 0
-      lambda { driver.visit("/") }.should_not raise_error(Capybara::TimeoutError)
+      lambda { visit("/") }.should_not raise_error(Timeout::Error)
     end
     it "should raise a timeout error" do
       driver.browser.timeout = 1
-      lambda { driver.visit("/") }.should raise_error(Capybara::TimeoutError, "Request timed out after 1 second")
+      lambda { visit("/") }.should raise_error(Timeout::Error, "Request timed out after 1 second")
     end
     it "should not raise an error when the timeout is high enough" do
       driver.browser.timeout = 10
-      lambda { driver.visit("/") }.should_not raise_error(Capybara::TimeoutError)
+      lambda { visit("/") }.should_not raise_error(Timeout::Error)
     end
     it "should set the timeout for each request" do
       driver.browser.timeout = 10
-      lambda { driver.visit("/") }.should_not raise_error(Capybara::TimeoutError)
+      lambda { visit("/") }.should_not raise_error(Timeout::Error)
       driver.browser.timeout = 1
-      lambda { driver.visit("/") }.should raise_error(Capybara::TimeoutError)
+      lambda { visit("/") }.should raise_error(Timeout::Error)
     end
     it "should set the timeout for each request" do
       driver.browser.timeout = 1
-      lambda { driver.visit("/") }.should raise_error(Capybara::TimeoutError)
+      lambda { visit("/") }.should raise_error(Timeout::Error)
       driver.reset!
       driver.browser.timeout = 10
-      lambda { driver.visit("/") }.should_not raise_error(Capybara::TimeoutError)
+      lambda { visit("/") }.should_not raise_error(Timeout::Error)
     end
     it "should raise a timeout on a slow form" do
       driver.browser.timeout = 3
-      driver.visit("/")
+      visit("/")
       driver.status_code.should == 200
       driver.browser.timeout = 1
       driver.find("//input").first.click
-      lambda { driver.status_code }.should raise_error(Capybara::TimeoutError)
+      lambda { driver.status_code }.should raise_error(Timeout::Error)
     end
     it "get timeout" do
@@ -1899,19 +2106,18 @@ describe Capybara::Webkit::Driver do
   describe "logger app" do
     it "logs nothing before turning on the logger" do
-      driver.visit("/")
+      visit("/")
       log.should == ""
     end
     it "logs its commands after turning on the logger" do
       driver.enable_logging
-      driver.visit("/")
+      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)
+      connection = Capybara::Webkit::Connection.new(:stdout => output)
       browser = Capybara::Webkit::Browser.new(connection)
       Capybara::Webkit::Driver.new(AppRunner.app, :browser => browser)
     end
@@ -1924,6 +2130,43 @@ describe Capybara::Webkit::Driver do
     end
   end
+  context "synchronous ajax app" do
+    let(:driver) do
+      driver_for_app do
+        get '/' do
+          <<-HTML
+            <html>
+            <body>
+            <form id="theForm">
+            <input type="submit" value="Submit" />
+            </form>
+            <script>
+              document.getElementById('theForm').onsubmit = function() {
+                xhr = new XMLHttpRequest();
+                xhr.open('POST', '/', false);
+                xhr.setRequestHeader('Content-Type', 'text/plain');
+                xhr.send('hello');
+                console.log(xhr.response);
+              }
+            </script>
+            </body>
+            </html>
+          HTML
+        end
+        post '/' do
+          request.body.read
+        end
+      end
+    end
+    it 'should not hang the server' do
+      visit('/')
+      driver.find('//input').first.click
+      driver.console_messages.first[:message].should == "hello"
+    end
+  end
   def driver_url(driver, path)
     URI.parse(driver.current_url).merge(path).to_s
   end