From d05cf9b9ec2133e467d34bee5c4f4b59a78e0755 Mon Sep 17 00:00:00 2001
From: Jonas Nicklas <jonas.nicklas@gmail.com>
Date: Sun, 11 Jul 2010 13:11:30 +0200
Subject: [PATCH] Don't use Capybara.log anymore, it's not really useful

---
 lib/capybara.rb        | 7 +------
 lib/capybara/server.rb | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/lib/capybara.rb b/lib/capybara.rb
index 58866d33..eb3be281 100644
--- a/lib/capybara.rb
+++ b/lib/capybara.rb
@@ -13,7 +13,7 @@ module Capybara
   class InfiniteRedirectError < TimeoutError; end
 
   class << self
-    attr_accessor :debug, :asset_root, :app_host, :run_server, :default_host
+    attr_accessor :asset_root, :app_host, :run_server, :default_host
     attr_accessor :default_selector, :default_wait_time, :ignore_hidden_elements
     attr_accessor :save_and_open_page_path
 
@@ -24,11 +24,6 @@ module Capybara
     def default_wait_time
       @default_wait_time ||= 2
     end
-
-    def log(message)
-      puts "[capybara] #{message}" if debug
-      true
-    end
   end
 
   autoload :Server,     'capybara/server'
diff --git a/lib/capybara/server.rb b/lib/capybara/server.rb
index 2f11870d..99f39f24 100644
--- a/lib/capybara/server.rb
+++ b/lib/capybara/server.rb
@@ -59,17 +59,13 @@ module Capybara
     def boot
       return self unless @app
       find_available_port
-      Capybara.log "application has already booted" and return self if responsive?
-      Capybara.log "booting Rack applicartion on port #{port}"
 
       Thread.new do
         handler.run(Identify.new(@app), :Port => port, :AccessLog => [])
       end
-      Capybara.log "checking if application has booted"
 
       Capybara.timeout(10) do
         if responsive?
-          Capybara.log("application has booted")
           true
         else
           sleep 0.5
@@ -78,7 +74,7 @@ module Capybara
       end
       self
     rescue Timeout::Error
-      Capybara.log "Rack application timed out during boot"
+      puts "Rack application timed out during boot"
       exit
     end