From dc49e5f87587a8f735beebca26ec5800c92fb88c Mon Sep 17 00:00:00 2001
From: "Hongli Lai (Phusion)" <hongli@phusion.nl>
Date: Mon, 15 Aug 2011 18:17:14 +0200
Subject: [PATCH] Forward webkit_server's stdout to Ruby's stdout.

This allows console.log() messages to be visible, and prevents
large numbers of console.log() calls from filling up webkit_server's pipe
which would block the process.
---
 lib/capybara/driver/webkit/browser.rb | 19 +++++++++++++++++++
 spec/browser_spec.rb                  |  9 +++++++++
 spec/spec_helper.rb                   |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/capybara/driver/webkit/browser.rb b/lib/capybara/driver/webkit/browser.rb
index 7e624d3..f753100 100644
--- a/lib/capybara/driver/webkit/browser.rb
+++ b/lib/capybara/driver/webkit/browser.rb
@@ -1,4 +1,5 @@
 require 'socket'
+require 'thread'
 require 'capybara/util/timeout'
 require 'json'
 
@@ -8,6 +9,9 @@ class Capybara::Driver::Webkit
 
     def initialize(options = {})
       @socket_class = options[:socket_class] || TCPSocket
+      @stdout       = options.has_key?(:stdout) ?
+                        options[:stdout] :
+                        $stdout
       start_server
       connect
     end
@@ -79,6 +83,10 @@ class Capybara::Driver::Webkit
     def start_server
       read_pipe, write_pipe = fork_server
       @server_port = discover_server_port(read_pipe)
+      @stdout_thread = Thread.new do
+        Thread.current.abort_on_exception = true
+        forward_stdout(read_pipe)
+      end
     end
 
     def fork_server
@@ -100,6 +108,17 @@ class Capybara::Driver::Webkit
       return unless IO.select([read_pipe], nil, nil, 10)
       ((read_pipe.first || '').match(/listening on port: (\d+)/) || [])[1].to_i
     end
+    
+    def forward_stdout(pipe)
+      while !pipe.eof?
+        line = pipe.readline
+        if @stdout
+          @stdout.write(line)
+          @stdout.flush
+        end
+      end
+    rescue EOFError
+    end
 
     def connect
       Capybara.timeout(5) do
diff --git a/spec/browser_spec.rb b/spec/browser_spec.rb
index 91d2435..fe6d2b5 100644
--- a/spec/browser_spec.rb
+++ b/spec/browser_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'stringio'
 require 'capybara/driver/webkit/browser'
 
 describe Capybara::Driver::Webkit::Browser do
@@ -22,5 +23,13 @@ describe Capybara::Driver::Webkit::Browser do
       new_browser.server_port.should_not == browser.server_port
     end
   end
+  
+  it 'forwards stdout to the given IO object' do
+    io = StringIO.new
+    new_browser = Capybara::Driver::Webkit::Browser.new(:stdout => io)
+    new_browser.execute_script('console.log("hello world")')
+    sleep(0.5)
+    io.string.should == "hello world\n"
+  end
 
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8edfcd2..77294b8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,7 +18,7 @@ end
 require File.join(spec_dir,"spec_helper")
 
 require 'capybara/driver/webkit/browser'
-$webkit_browser = Capybara::Driver::Webkit::Browser.new(:socket_class => TCPSocket)
+$webkit_browser = Capybara::Driver::Webkit::Browser.new(:socket_class => TCPSocket, :stdout => nil)
 
 Capybara.register_driver :reusable_webkit do |app|
   Capybara::Driver::Webkit.new(app, :browser => $webkit_browser)