capybara-webkit 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60209d81bf188faa0999eaefc0ed131547e4bcc1
-  data.tar.gz: 69865244998cee40ed5a6a49225f6ae555962ecf
+  metadata.gz: bfe45069f7c609493f80959297ea7d06b1cba3f6
+  data.tar.gz: 144cd7bbc569e2ba13898e82ef283c0ba7bfdcd4
 SHA512:
-  metadata.gz: f9287cdc79dc08a5c996d8cb7275bbf002e53589f68d009472f057ed66b17391e14d30ed5ff4264bc87f71c26aa2eb76ca1861e5ac25592c4e6715095a6f50b1
-  data.tar.gz: 0ce7df637af72ca80c176649c9e9ec456b0ebf6991f0f8e47edc33e81fced0b577ee351ce7cf7c5e016bebb7e39aab01189cf0f8fc35f4a55b562f7adcf39c1c
+  metadata.gz: 67ece91583df2ece012ee3ed52f31388ab07fa06216f66466c07b33dfab3b0daecbd97726ebd7376d57ff712ad201e152780edf36a4daa0635a564aaa19a2ed7
+  data.tar.gz: ee13cf5f47fb27b8ffc044bf4e592df638e7963647432255ec9744c016453291b3cfa72b64b4091e9cfab63ca7dd2f91e3dc249007feb9eb30018f694138f3e2

data/Appraisals

@@ -1,9 +1,9 @@
-appraise "2.4" do
-  gem "capybara", "~> 2.4.0"
+appraise "2.6" do
+  gem "capybara", "~> 2.6.0"
 end
 
-appraise "2.5" do
-  gem "capybara", "~> 2.5.0"
+appraise "2.7" do
+  gem "capybara", "~> 2.7.0"
 end
 
 appraise "master" do

data/NEWS.md

@@ -1,3 +1,12 @@
+New for 1.10.0:
+
+* Capybara 2.7 compatibility
+* Extract class for booting the server
+* Move stderr option to config
+* Deprecate webkit_debug driver
+* Abort requests before changing settings
+* Convert JavaScript DateTime objects to Ruby Date objects on evaluation
+
 New for 1.9.0:
 
 * Raise error for Qt version greater than 5.5

data/capybara-webkit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.0"
 
-  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.7.0")
+  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.8.0")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.14.0")

data/gemfiles/2.6.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19]
 gem "capybara", "~> 2.6.0"
-gem "mime-types", "< 3.0", platforms: [:ruby_19, :jruby_19]
 
 gemspec :path=>"../"

data/gemfiles/{2.4.gemfile → 2.7.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19]
-gem "capybara", "~> 2.4.0"
+gem "capybara", "~> 2.7.0"
 
 gemspec :path=>"../"

data/lib/capybara/webkit.rb

@@ -16,6 +16,14 @@ Capybara.register_driver :webkit do |app|
 end
 
 Capybara.register_driver :webkit_debug do |app|
+  warn "[DEPRECATION] The webkit_debug driver is deprecated. " \
+    "Please use Capybara::Webkit.configure instead:\n\n" \
+    "  Capybara::Webkit.configure do |config|\n" \
+    "    config.debug = true\n" \
+    "  end\n\n" \
+    "This option is global and can be configured once" \
+    " (not in a `before` or `setup` block)."
+
   Capybara::Webkit::Driver.new(
     app,
     Capybara::Webkit::Configuration.to_hash.merge(debug: true)

data/lib/capybara/webkit/configuration.rb

@@ -27,6 +27,7 @@ module Capybara
       attr_accessor :debug
       attr_writer :ignore_ssl_errors
       attr_accessor :proxy
+      attr_accessor :stderr
       attr_accessor :timeout
       attr_writer :skip_image_loading
 
@@ -38,6 +39,7 @@ module Capybara
         @ignore_ssl_errors = false
         @proxy = nil
         @skip_image_loading = false
+        @stderr = $stderr
         @timeout = -1
       end
 
@@ -90,6 +92,7 @@ module Capybara
           ignore_ssl_errors: ignore_ssl_errors?,
           proxy: proxy,
           skip_image_loading: skip_image_loading?,
+          stderr: stderr,
           timeout: timeout
         }
       end

data/lib/capybara/webkit/connection.rb

@@ -1,15 +1,9 @@
 require 'socket'
 require 'timeout'
 require 'thread'
-require 'open3'
 
 module Capybara::Webkit
   class Connection
-    SERVER_PATH = File.expand_path("../../../../bin/webkit_server", __FILE__)
-    WEBKIT_SERVER_START_TIMEOUT = 15
-
-    attr_reader :port, :pid
-
     def initialize(options = {})
       @socket = nil
       if options.has_key?(:socket_class)
@@ -19,15 +13,7 @@ module Capybara::Webkit
       else
         @socket_class = TCPSocket
       end
-      if options.has_key?(:stderr)
-        @output_target = options[:stderr]
-      elsif options.has_key?(:stdout)
-        warn '[DEPRECATION] The Capybara::Webkit::Connection `stdout` option ' \
-          'is deprecated. Please use `stderr` instead.'
-        @output_target = options[:stdout]
-      else
-        @output_target = $stderr
-      end
+      @server = options[:server]
       start_server
       connect
     end
@@ -67,44 +53,18 @@ module Capybara::Webkit
       connect
     end
 
-    private
-
-    def start_server
-      open_pipe
-      discover_port
-      discover_pid
-      forward_output_in_background_thread
+    def port
+      @server.port
     end
 
-    def open_pipe
-      @pipe_stdin, @pipe_stdout, @pipe_stderr, @wait_thr = Open3.popen3(SERVER_PATH)
+    def pid
+      @server.pid
     end
 
-    def parse_port(line)
-      if match = line.to_s.match(/listening on port: (\d+)/)
-        match[1].to_i
-      else
-        raise ConnectionError, "#{SERVER_PATH} failed to start."
-      end
-    end
-
-    def discover_port
-      if IO.select([@pipe_stdout], nil, nil, WEBKIT_SERVER_START_TIMEOUT)
-        @port = parse_port(@pipe_stdout.first)
-      else
-        raise ConnectionError, "#{SERVER_PATH} failed to start after #{WEBKIT_SERVER_START_TIMEOUT} seconds."
-      end
-    end
-
-    def discover_pid
-      @pid = @wait_thr[:pid]
-    end
+    private
 
-    def forward_output_in_background_thread
-      Thread.new do
-        Thread.current.abort_on_exception = true
-        IO.copy_stream(@pipe_stderr, @output_target) if @output_target
-      end
+    def start_server
+      @server.start
     end
 
     def connect
@@ -116,7 +76,7 @@ module Capybara::Webkit
     end
 
     def attempt_connect
-      @socket = @socket_class.open("127.0.0.1", @port)
+      @socket = @socket_class.open("127.0.0.1", port)
       if defined?(Socket::TCP_NODELAY)
         @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
       end

data/lib/capybara/webkit/driver.rb

@@ -5,12 +5,14 @@ require "capybara/webkit/connection"
 require "capybara/webkit/browser"
 require "capybara/webkit/cookie_jar"
 require "capybara/webkit/errors"
+require "capybara/webkit/server"
 
 module Capybara::Webkit
   class Driver < Capybara::Driver::Base
     def initialize(app, options={})
       @app = app
-      @options = options
+      @options = options.dup
+      @options[:server] ||= Server.new(options)
       @browser = options[:browser] || Browser.new(Connection.new(options))
       apply_options
     end

data/lib/capybara/webkit/server.rb

@@ -0,0 +1,72 @@
+require "open3"
+require "thread"
+
+module Capybara
+  module Webkit
+    class Server
+      SERVER_PATH = File.expand_path("../../../../bin/webkit_server", __FILE__)
+      WEBKIT_SERVER_START_TIMEOUT = 15
+
+      attr_reader :port, :pid
+
+      def initialize(options = {})
+        if options.has_key?(:stderr)
+          @output_target = options[:stderr]
+        elsif options.has_key?(:stdout)
+          warn "[DEPRECATION] The Capybara::Webkit::Connection `stdout` " \
+            "option is deprecated. Please use `stderr` instead."
+          @output_target = options[:stdout]
+        else
+          @output_target = $stderr
+        end
+      end
+
+      def start
+        open_pipe
+        discover_port
+        discover_pid
+        forward_output_in_background_thread
+      end
+
+      private
+
+      def open_pipe
+        @pipe_stdin,
+          @pipe_stdout,
+          @pipe_stderr,
+          @wait_thr = Open3.popen3(SERVER_PATH)
+      end
+
+      def discover_port
+        if IO.select([@pipe_stdout], nil, nil, WEBKIT_SERVER_START_TIMEOUT)
+          @port = parse_port(@pipe_stdout.first)
+        else
+          raise(
+            ConnectionError,
+            "#{SERVER_PATH} failed to start after " \
+            "#{WEBKIT_SERVER_START_TIMEOUT} seconds.",
+          )
+        end
+      end
+
+      def parse_port(line)
+        if match = line.to_s.match(/listening on port: (\d+)/)
+          match[1].to_i
+        else
+          raise ConnectionError, "#{SERVER_PATH} failed to start."
+        end
+      end
+
+      def discover_pid
+        @pid = @wait_thr[:pid]
+      end
+
+      def forward_output_in_background_thread
+        Thread.new do
+          Thread.current.abort_on_exception = true
+          IO.copy_stream(@pipe_stderr, @output_target) if @output_target
+        end
+      end
+    end
+  end
+end

data/lib/capybara/webkit/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = "1.9.0".freeze
+      VERSION = "1.10.0".freeze
     end
   end
 end

data/spec/browser_spec.rb

@@ -7,7 +7,8 @@ require 'base64'
 
 describe Capybara::Webkit::Browser do
 
-  let(:connection) { Capybara::Webkit::Connection.new }
+  let(:server) { Capybara::Webkit::Server.new }
+  let(:connection) { Capybara::Webkit::Connection.new(server: server) }
   let(:browser) { Capybara::Webkit::Browser.new(connection) }
 
   describe "forking", skip_on_windows: true, skip_on_jruby: true do

data/spec/connection_spec.rb

@@ -2,144 +2,18 @@ require 'spec_helper'
 require 'capybara/webkit/connection'
 
 describe Capybara::Webkit::Connection do
-  it "kills the process when the parent process dies", skip_on_windows: true, skip_on_jruby: true do
-    read_io, write_io = IO.pipe
-
-    fork_pid = fork do
-      read_io.close
-      connection = Capybara::Webkit::Connection.new
-      write_io.write(connection.pid)
-      write_io.close
-      Process.wait(connection.pid)
-    end
-
-    write_io.close
-
-    webkit_pid = read_io.read.to_i
-    webkit_pid.should be > 1
-    read_io.close
-    Process.kill(9, fork_pid)
-    eventually { expect { Process.getpgid(webkit_pid) }.to raise_error Errno::ESRCH }
-  end
-
-  def eventually
-    polling_interval = 0.1
-    time_limit = Time.now + 3
-    loop do
-      begin
-        yield
-        return
-      rescue RSpec::Expectations::ExpectationNotMetError => error
-        raise error if Time.now >= time_limit
-        sleep polling_interval
-      end
-    end
-  end
-
-  it "raises an error if the server has stopped", skip_on_windows: true do
-    path = 'false'
-    stub_const("Capybara::Webkit::Connection::SERVER_PATH", path)
-
-    expect { Capybara::Webkit::Connection.new }.
-      to raise_error(
-        Capybara::Webkit::ConnectionError,
-        "#{path} failed to start.")
-  end
-
-  it "raises an error if the server is not ready", skip_on_windows: true do
-    server_path = 'sleep 1'
-    stub_const("Capybara::Webkit::Connection::SERVER_PATH", server_path)
-    start_timeout = 0.5
-    stub_const("Capybara::Webkit::Connection::WEBKIT_SERVER_START_TIMEOUT", start_timeout)
-
-    error_string =
-      if defined?(::JRUBY_VERSION)
-        "#{server_path} failed to start."
-      else
-        "#{server_path} failed to start after #{start_timeout} seconds."
-      end
-
-    expect { Capybara::Webkit::Connection.new }.
-      to raise_error(Capybara::Webkit::ConnectionError, error_string)
-  end
-
-  it "boots a server to talk to" do
-    url = "http://#{@rack_server.host}:#{@rack_server.port}/"
-    connection.puts "Visit"
-    connection.puts 1
-    connection.puts url.to_s.bytesize
-    connection.print url
-    connection.gets.should eq "ok\n"
-    connection.gets.should eq "0\n"
-    connection.puts "Body"
-    connection.puts 0
-    connection.gets.should eq "ok\n"
-    response_length = connection.gets.to_i
-    response = connection.read(response_length)
-    response.should include("Hey there")
-  end
-
-  it 'forwards stderr to the given IO object' do
-    read_io, write_io = IO.pipe
-    redirected_connection = Capybara::Webkit::Connection.new(:stderr => write_io)
-    redirected_connection.puts "EnableLogging"
-    redirected_connection.puts 0
-
-    script = 'console.log("hello world")'
-    redirected_connection.puts "Execute"
-    redirected_connection.puts 1
-    redirected_connection.puts script.to_s.bytesize
-    redirected_connection.print script
-
-    expect(read_io).to include_response "\nhello world"
-  end
-
-  it 'does not forward stderr to nil' do
-    IO.should_not_receive(:copy_stream)
-    Capybara::Webkit::Connection.new(:stderr => nil)
-  end
-
-  it 'prints a deprecation warning if the stdout option is used' do
-    Capybara::Webkit::Connection.any_instance.should_receive(:warn)
-    Capybara::Webkit::Connection.new(:stdout => nil)
-  end
-
-  it 'does not forward stdout to nil if the stdout option is used' do
-    Capybara::Webkit::Connection.any_instance.stub(:warn)
-    IO.should_not_receive(:copy_stream)
-    Capybara::Webkit::Connection.new(:stdout => nil)
-  end
-
-  it "returns the server port" do
-    connection.port.should be_between 0x400, 0xffff
-  end
-
-  it 'sets appropriate options on its socket' do
-    socket = double('socket')
+  it "sets appropriate options on its socket" do
+    socket = double("socket")
+    server = double(:Server, start: nil, port: 123)
     TCPSocket.stub(:open).and_return(socket)
     if defined?(Socket::TCP_NODELAY)
-      socket.should_receive(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
+      socket.
+        should_receive(:setsockopt).
+        with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
     else
       socket.should_not_receive(:setsockopt)
     end
-    Capybara::Webkit::Connection.new
-  end
 
-  it "chooses a new port number for a new connection" do
-    new_connection = Capybara::Webkit::Connection.new
-    new_connection.port.should_not == connection.port
-  end
-
-  let(:connection) { Capybara::Webkit::Connection.new }
-
-  before(:all) do
-    @app = lambda do |env|
-      body = "<html><body>Hey there</body></html>"
-      [200,
-        { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s },
-        [body]]
-    end
-    @rack_server = Capybara::Server.new(@app)
-    @rack_server.boot
+    Capybara::Webkit::Connection.new(server: server)
   end
 end

data/spec/driver_spec.rb

@@ -479,6 +479,11 @@ describe Capybara::Webkit::Driver do
       result.should eq nil
     end
 
+    it "evaluates Javascript and returns a date" do
+      result = driver.evaluate_script(%<new Date("2016-04-01T00:00:00Z")>)
+      result.should eq "2016-04-01T00:00:00Z"
+    end
+
     it "evaluates Javascript and returns an object" do
       result = driver.evaluate_script(%<({ 'one' : 1 })>)
       result.should eq 'one' => 1
@@ -1821,13 +1826,14 @@ describe Capybara::Webkit::Driver do
 
   context "no response app" do
     let(:driver) do
-      driver_for_html(<<-HTML, browser: browser)
+      driver_for_html(<<-HTML)
         <html><body>
           <form action="/error"><input type="submit"/></form>
         </body></html>
       HTML
     end
 
+    let!(:connection) { fork_connection }
     before { visit("/") }
 
     it "raises a webkit error for the requested url" do
@@ -1850,9 +1856,6 @@ describe Capybara::Webkit::Driver do
       connection.stub(:puts)
       connection.stub(:print)
     end
-
-    let(:browser) { Capybara::Webkit::Browser.new(connection) }
-    let(:connection) { Capybara::Webkit::Connection.new }
   end
 
   context "custom font app" do
@@ -2722,7 +2725,7 @@ CACHE MANIFEST
   describe "url whitelisting", skip_if_offline: true do
     it_behaves_like "output writer" do
       let(:driver) do
-        driver_for_html(<<-HTML, browser: browser)
+        driver_for_html(<<-HTML)
           <<-HTML
             <html>
               <body>
@@ -2885,7 +2888,7 @@ CACHE MANIFEST
   describe "logger app" do
     it_behaves_like "output writer" do
       let(:driver) do
-        driver_for_html("<html><body>Hello</body></html>", browser: browser)
+        driver_for_html("<html><body>Hello</body></html>")
       end
 
       it "logs nothing in normal mode" do
@@ -3066,7 +3069,7 @@ CACHE MANIFEST
     it_behaves_like "output writer" do
       let(:driver) do
         count = 0
-        driver_for_app browser: browser do
+        driver_for_app do
           get "/" do
             count += 1
             <<-HTML
@@ -3111,17 +3114,15 @@ CACHE MANIFEST
 
   context "when the driver process crashes" do
     let(:driver) do
-      driver_for_app browser: browser do
+      driver_for_app do
         get "/" do
           "<html><body>Relaunched</body></html>"
         end
       end
     end
 
-    let(:browser) { Capybara::Webkit::Browser.new(connection) }
-    let(:connection) { Capybara::Webkit::Connection.new }
-
     it "reports and relaunches on reset" do
+      connection = fork_connection
       Process.kill "KILL", connection.pid
       expect { driver.reset! }.to raise_error(Capybara::Webkit::CrashError)
       visit "/"
@@ -3157,6 +3158,8 @@ CACHE MANIFEST
           conn.close
         end
       end
+
+      fork_connection
     end
 
     after do
@@ -3190,9 +3193,7 @@ CACHE MANIFEST
       end
     end
 
-    let(:driver) { driver_for_html("", browser: browser) }
-    let(:browser) { Capybara::Webkit::Browser.new(connection) }
-    let(:connection) { Capybara::Webkit::Connection.new }
+    let(:driver) { driver_for_html("") }
   end
 
   context "skip image loading" do
@@ -3295,6 +3296,8 @@ CACHE MANIFEST
         config.use_proxy host: @host, port: @port, user: @user, pass: @pass
       end
 
+      fork_connection
+
       driver.visit @url
       @proxy_requests.size.should eq 2
       @request = @proxy_requests[-1]
@@ -3306,7 +3309,7 @@ CACHE MANIFEST
     end
 
     let(:driver) do
-      driver_for_html("", browser: nil)
+      driver_for_html("")
     end
 
     it "uses the HTTP proxy correctly" do

data/spec/server_spec.rb

@@ -0,0 +1,150 @@
+require "spec_helper"
+require "capybara/webkit/server"
+
+describe Capybara::Webkit::Connection do
+  it "ensures the process ends", skip_on_windows: true, skip_on_jruby: true do
+    read_io, write_io = IO.pipe
+
+    fork_pid = fork do
+      read_io.close
+      server = start_server
+      write_io.write(server.pid)
+      write_io.close
+      Process.wait(server.pid)
+    end
+
+    write_io.close
+
+    webkit_pid = read_io.read.to_i
+    webkit_pid.should be > 1
+    read_io.close
+    Process.kill(9, fork_pid)
+
+    eventually do
+      expect { Process.getpgid(webkit_pid) }.to raise_error Errno::ESRCH
+    end
+  end
+
+  it "raises an error if the server has stopped", skip_on_windows: true do
+    path = "false"
+    stub_const("Capybara::Webkit::Server::SERVER_PATH", path)
+
+    expect { start_server }.
+      to raise_error(
+        Capybara::Webkit::ConnectionError,
+        "#{path} failed to start.")
+  end
+
+  it "raises an error if the server is not ready", skip_on_windows: true do
+    server_path = "sleep 1"
+    stub_const("Capybara::Webkit::Server::SERVER_PATH", server_path)
+    start_timeout = 0.5
+    stub_const(
+      "Capybara::Webkit::Server::WEBKIT_SERVER_START_TIMEOUT",
+      start_timeout,
+    )
+
+    error_string =
+      if defined?(::JRUBY_VERSION)
+        "#{server_path} failed to start."
+      else
+        "#{server_path} failed to start after #{start_timeout} seconds."
+      end
+
+    expect { start_server }.
+      to raise_error(Capybara::Webkit::ConnectionError, error_string)
+  end
+
+  it "boots a server to talk to" do
+    url = "http://#{@rack_server.host}:#{@rack_server.port}/"
+    server = start_server
+    socket = connect_to(server)
+    socket.puts "Visit"
+    socket.puts 1
+    socket.puts url.to_s.bytesize
+    socket.print url
+    socket.gets.should eq "ok\n"
+    socket.gets.should eq "0\n"
+    socket.puts "Body"
+    socket.puts 0
+    socket.gets.should eq "ok\n"
+    response_length = socket.gets.to_i
+    response = socket.read(response_length)
+    response.should include("Hey there")
+  end
+
+  it "forwards stderr to the given IO object" do
+    read_io, write_io = IO.pipe
+    server = start_server(stderr: write_io)
+    socket = connect_to(server)
+    socket.puts "EnableLogging"
+    socket.puts 0
+
+    script = "console.log('hello world')"
+    socket.puts "Execute"
+    socket.puts 1
+    socket.puts script.to_s.bytesize
+    socket.print script
+
+    expect(read_io).to include_response "\nhello world"
+  end
+
+  it "does not forward stderr to nil" do
+    IO.should_not_receive(:copy_stream)
+    start_server(stderr: nil)
+  end
+
+  it "prints a deprecation warning if the stdout option is used" do
+    Capybara::Webkit::Server.any_instance.should_receive(:warn)
+    start_server(stdout: nil)
+  end
+
+  it "does not forward stdout to nil if the stdout option is used" do
+    Capybara::Webkit::Server.any_instance.stub(:warn)
+    IO.should_not_receive(:copy_stream)
+    start_server(stdout: nil)
+  end
+
+  it "returns the server port" do
+    start_server.port.should be_between 0x400, 0xffff
+  end
+
+  it "chooses a new port number for a new connection" do
+    start_server.port.should_not == start_server.port
+  end
+
+  before(:all) do
+    @app = lambda do |_|
+      body = "<html><body>Hey there</body></html>"
+      [
+        200,
+        { "Content-Type" => "text/html", "Content-Length" => body.size.to_s },
+        [body],
+      ]
+    end
+    @rack_server = Capybara::Server.new(@app)
+    @rack_server.boot
+  end
+
+  def start_server(options = {})
+    Capybara::Webkit::Server.new(options).tap(&:start)
+  end
+
+  def connect_to(server)
+    TCPSocket.open("127.0.0.1", server.port)
+  end
+
+  def eventually
+    polling_interval = 0.1
+    time_limit = Time.now + 3
+    loop do
+      begin
+        yield
+        return
+      rescue RSpec::Expectations::ExpectationNotMetError => error
+        raise error if Time.now >= time_limit
+        sleep polling_interval
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,8 @@ $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 Dir[File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')].each { |file| require(file) }
 
 require 'capybara/webkit'
-$webkit_connection = Capybara::Webkit::Connection.new
+$webkit_server = Capybara::Webkit::Server.new
+$webkit_connection = Capybara::Webkit::Connection.new(server: $webkit_server)
 $webkit_browser = Capybara::Webkit::Browser.new($webkit_connection)
 
 if ENV['DEBUG']

data/spec/support/app_runner.rb

@@ -5,7 +5,7 @@ require 'sinatra/base'
 
 module AppRunner
   class << self
-    attr_accessor :app, :app_host, :configuration
+    attr_accessor :app, :app_host, :browser, :configuration
   end
 
   def self.boot
@@ -20,6 +20,8 @@ module AppRunner
       [200, { 'Content-Type' => 'html', 'Content-Length' => 0 }, []]
     end
 
+    self.browser = $webkit_browser
+
     self.configuration = Capybara::Webkit::Configuration.new
   end
 
@@ -31,15 +33,26 @@ module AppRunner
     yield AppRunner.configuration
   end
 
-  def driver_for_app(*driver_args, &body)
+  def fork_connection
+    AppRunner.fork_connection
+  end
+
+  def self.fork_connection
+    server = Capybara::Webkit::Server.new(options)
+    connection = Capybara::Webkit::Connection.new(server: server)
+    AppRunner.browser = Capybara::Webkit::Browser.new(connection)
+    connection
+  end
+
+  def driver_for_app(&body)
     app = Class.new(ExampleApp, &body)
     run_application app
-    build_driver(*driver_args)
+    AppRunner.build_driver
   end
 
-  def driver_for_html(html, *driver_args)
+  def driver_for_html(html)
     run_application_for_html html
-    build_driver(*driver_args)
+    AppRunner.build_driver
   end
 
   def session_for_app(&body)
@@ -54,15 +67,14 @@ module AppRunner
     }
   end
 
-  private
+  def self.build_driver
+    Capybara::Webkit::Driver.new(app, options.merge(browser: browser))
+  end
 
-  def build_driver(overrides = {})
-    options = AppRunner.configuration.
-      to_hash.
-      merge(browser: $webkit_browser).
-      merge(overrides)
-    Capybara::Webkit::Driver.new(AppRunner.app, options)
+  def self.options
+    configuration.to_hash
   end
+  private_class_method :options
 
   def self.included(example_group)
     example_group.class_eval do

data/spec/support/output_writer.rb

@@ -1,11 +1,8 @@
 shared_examples_for "output writer" do
   before do
     @read, @write = IO.pipe
-  end
-
-  let(:browser) do
-    connection = Capybara::Webkit::Connection.new(:stderr => @write)
-    Capybara::Webkit::Browser.new(connection)
+    configure { |config| config.stderr = @write }
+    fork_connection
   end
 
   let(:stderr) do

data/src/JsonSerializer.cpp

@@ -13,9 +13,9 @@ void JsonSerializer::addVariant(const QVariant &object) {
   if (object.isValid()) {
     switch(object.type()) {
       case QMetaType::QString:
+      case QMetaType::QDateTime:
         {
-          QString string = object.toString();
-          addString(string);
+          addString(object.toString());
         }
         break;
       case QMetaType::QVariantList:

data/src/WebPageManager.cpp

@@ -145,14 +145,6 @@ void WebPageManager::setTimeout(int timeout) {
 }
 
 void WebPageManager::reset() {
-  m_timeout = -1;
-  m_cookieJar->clearCookies();
-  m_networkAccessManager->reset();
-  m_customHeadersRequestHandler->reset();
-  m_currentPage->resetLocalStorage();
-  m_blacklistedRequestHandler->reset();
-  m_unknownUrlHandler->reset();
-
   foreach(QNetworkReply *reply, m_pendingReplies) {
     logger() << "Aborting request to" << reply->url().toString();
     reply->abort();
@@ -164,6 +156,15 @@ void WebPageManager::reset() {
     page->deleteLater();
   }
 
+  m_timeout = -1;
+  m_cookieJar->clearCookies();
+  m_networkAccessManager->reset();
+  m_customHeadersRequestHandler->reset();
+  m_currentPage->resetLocalStorage();
+  m_blacklistedRequestHandler->reset();
+  m_unknownUrlHandler->reset();
+
+
   qint64 size = QWebSettings::offlineWebApplicationCacheQuota();
   // No public function was found to wrap the empty() call to
   // WebCore::cacheStorage().empty()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -24,7 +24,7 @@ dependencies:
         version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -169,9 +169,8 @@ files:
 - bin/Info.plist
 - capybara-webkit.gemspec
 - extconf.rb
-- gemfiles/2.4.gemfile
-- gemfiles/2.5.gemfile
 - gemfiles/2.6.gemfile
+- gemfiles/2.7.gemfile
 - gemfiles/master.gemfile
 - lib/capybara-webkit.rb
 - lib/capybara/webkit.rb
@@ -183,6 +182,7 @@ files:
 - lib/capybara/webkit/errors.rb
 - lib/capybara/webkit/matchers.rb
 - lib/capybara/webkit/node.rb
+- lib/capybara/webkit/server.rb
 - lib/capybara/webkit/version.rb
 - lib/capybara_webkit_builder.rb
 - spec/browser_spec.rb
@@ -197,6 +197,7 @@ files:
 - spec/integration/session_spec.rb
 - spec/selenium_compatibility_spec.rb
 - spec/self_signed_ssl_cert.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/app_runner.rb
 - spec/support/matchers/include_response.rb

data/gemfiles/2.5.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19]
-gem "capybara", "~> 2.5.0"
-
-gemspec :path=>"../"