From b096370c65cd24445c1d4b724bb3c0d84435a69b Mon Sep 17 00:00:00 2001
From: Jonas Nicklas <jonas.nicklas@gmail.com>
Date: Fri, 1 Jan 2010 20:13:54 +0100
Subject: [PATCH] Publically expose the browser objects

---
 lib/capybara/driver/celerity_driver.rb | 18 +++++++++---------
 lib/capybara/driver/culerity_driver.rb |  2 --
 lib/capybara/driver/selenium_driver.rb | 18 +++++++++---------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lib/capybara/driver/celerity_driver.rb b/lib/capybara/driver/celerity_driver.rb
index b2436db3..4d27c67f 100644
--- a/lib/capybara/driver/celerity_driver.rb
+++ b/lib/capybara/driver/celerity_driver.rb
@@ -82,6 +82,15 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
     browser.execute_script "#{script}"
   end
 
+  def browser
+    unless @_browser
+      require 'celerity'
+      @_browser = ::Celerity::Browser.new(:browser => :firefox, :log_level => :off)
+    end
+    
+    @_browser
+  end
+
 private
 
   def url(path)
@@ -92,13 +101,4 @@ private
     end
   end
 
-  def browser
-    unless @_browser
-      require 'celerity'
-      @_browser = ::Celerity::Browser.new(:browser => :firefox, :log_level => :off)
-    end
-    
-    @_browser
-  end
-
 end
diff --git a/lib/capybara/driver/culerity_driver.rb b/lib/capybara/driver/culerity_driver.rb
index 57262505..33e028ba 100644
--- a/lib/capybara/driver/culerity_driver.rb
+++ b/lib/capybara/driver/culerity_driver.rb
@@ -12,8 +12,6 @@ class Capybara::Driver::Culerity < Capybara::Driver::Celerity
     @_server
   end
 
-private
-
   def browser
     unless @_browser
       @_browser = ::Culerity::RemoteBrowserProxy.new self.class.server, {:browser => :firefox, :log_level => :off}
diff --git a/lib/capybara/driver/selenium_driver.rb b/lib/capybara/driver/selenium_driver.rb
index 3fc0ab59..4842f3cc 100644
--- a/lib/capybara/driver/selenium_driver.rb
+++ b/lib/capybara/driver/selenium_driver.rb
@@ -75,25 +75,29 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
   end
 
   def visit(path)
-    driver.navigate.to(url(path))
+    browser.navigate.to(url(path))
   end
 
   def body
-    driver.page_source
+    browser.page_source
   end
 
   def current_url
-    driver.current_url
+    browser.current_url
   end
 
   def find(selector)
-    driver.find_elements(:xpath, selector).map { |node| Node.new(self, node) }
+    browser.find_elements(:xpath, selector).map { |node| Node.new(self, node) }
   end
 
   def wait?; true; end
 
   def evaluate_script(script)
-    driver.execute_script "return #{script}"
+    browser.execute_script "return #{script}"
+  end
+  
+  def browser
+    self.class.driver
   end
 
 private
@@ -106,8 +110,4 @@ private
     end
   end
 
-  def driver
-    self.class.driver
-  end
-
 end