0
@@ -4,7 +4,7 @@ module SeleniumRails
0
   class RailsApplication
0
     include WEBrick::HTMLUtils
0
     
0
-  	def self.standard
0
+  	def self.default
0
      aut_options = {
0
         :port        => 4001,
0
         :ip          => "127.0.0.1",

0
@@ -55,16 +55,13 @@ module SeleniumRails
0
       command += "&session=#{session}" if session
0
       uri = URI.parse(command)
0
       begin
0
-        puts "CALLING #{uri}"
0
         request = Net::HTTP::Get.new(uri.path+"?"+uri.query)
0
         res = Net::HTTP.start(uri.host,uri.port) { |http|
0
           http.read_timeout = 5
0
           http.request(request)
0
         }
0
-        puts "SUCCESS #{res}"
0
         return true
0
       rescue 
0
-        puts "FAILED"
0
         return false
0
       end
0
     end

0
@@ -4,19 +4,20 @@ module SeleniumRails
0
 
0
   class Runner < Test::Unit::UI::Console::TestRunner
0
 
0
+    def self.selenium_session
0
+      # yuk, yuk, yuk
0
+      @@session
0
+    end
0
+
0
     def started(result)
0
       super(result)   
0
-			@seleniumRC = SeleniumRC.new
0
-			@application = RailsApplication.standard
0
-			@seleniumRC.start
0
-			@application.start
0
+			@@session ||= SeleniumRails::Session.default.new
0
+			@@session.start
0
     end
0
   
0
     def finished(elapsed_time)
0
+		  @@session.stop
0
       super(elapsed_time)
0
-			@application.stop
0
-			Test::Unit::TestCase.close_selenium_sessions
0
-			@seleniumRC.stop      
0
     end
0
   end
0
 

0
@@ -1,64 +1,30 @@
0
 module SeleniumRails
0
 module TestCase
0
   
0
-  def self.included(base)
0
-    base.extend(ClassMethods)
0
-  end
0
-  
0
-  def selenium_session(session= nil)
0
-    self.class.selenium_session(session)
0
+  def selenium_session
0
+    SeleniumRails::Runner.selenium_session
0
   end
0
   
0
    # Overrides standard "open" method with @selenium.open
0
-    def open(addr)
0
-      selenium_session.open(addr)
0
-    end
0
+   def open(addr)
0
+    selenium_session.open(addr)
0
+  end
0
 
0
-    # Overrides standard "type" method with @selenium.type
0
-    def type(inputLocator, value)
0
-      selenium_session.type(inputLocator, value)
0
-    end
0
+  # Overrides standard "type" method with @selenium.type
0
+  def type(inputLocator, value)
0
+    selenium_session.type(inputLocator, value)
0
+  end
0
+
0
+  # Overrides standard "select" method with @selenium.select
0
+  def select(inputLocator, optionLocator)
0
+    selenium_session.select(inputLocator, optionLocator)
0
+  end
0
 
0
-    # Overrides standard "select" method with @selenium.select
0
-    def select(inputLocator, optionLocator)
0
-      selenium_session.select(inputLocator, optionLocator)
0
-    end
0
-  
0
   def method_missing(method_name, *args)
0
     if args.empty?
0
-        selenium_session.send(method_name)
0
+       selenium_session.send(method_name)
0
     else
0
-        selenium_session.send(method_name, *args)
0
-    end
0
-  end
0
-  
0
-  module ClassMethods         
0
-    @@sessions = []  
0
-      
0
-    def acceptance_test(name,&block)
0
-       class_eval do
0
-    	   define_method("test_"+name.underscore) do
0
-   	       instance_eval &block
0
-         end
0
-       end
0
-    end
0
-    
0
-    def new_selenium_session(session=nil)  
0
-      session ||= Selenium::SeleneseInterpreter.new("localhost", 4444, "*firefox", "http://localhost:4001", 10000);   
0
-      yield session if block_given?
0
-      session.start
0
-   	  @@sessions << session
0
-   	  return session
0
-    end
0
-  
0
-    def selenium_session(session = nil)     
0
-      @@sessions.last || new_selenium_session(session)
0
-    end
0
-  
0
-    def close_selenium_sessions 
0
-      while (s = @@sessions.pop) do
0
-        s.stop
0
-      end       
0
+       selenium_session.send(method_name, *args)
0
     end
0
   end
0
 end

0
@@ -1,8 +1,5 @@
0
 require 'rake/testtask'                          
0
 
0
-Rake.application.options.trace = true
0
-
0
-
0
 namespace :test do
0
   desc "Starts the java selenium proxy."
0
   task(:selenium_proxy) do