0
@@ -15,8 +15,15 @@ module SeleniumRails
0
       @@session.start
0
     end
0
   
0
+	  def start_mediator
0
+      return @mediator.run_suite
0
+    rescue Exception => e
0
+      @@session.stop rescue nil
0
+      raise e
0
+    end
0
+	
0
     def finished(elapsed_time)
0
-		  @@session.stop
0
+		  @@session.stop rescue nil
0
       super(elapsed_time)
0
     end
0
   end

0
@@ -1,31 +1,43 @@
0
 module SeleniumRails
0
   module Session
0
    
0
+   module Infrastructure
0
+     def start
0
+       @infrastructure.each { |i| i.start }
0
+     end
0
+     
0
+     def stop
0
+       @infrastructure.reverse.each { |i| i.stop }
0
+     end
0
+     
0
+     def method_missing(method_name,*args)
0
+       if args.empty?
0
+          @session.send(method_name)
0
+       else
0
+          @session.send(method_name, *args)
0
+       end
0
+     end
0
+   end
0
+   
0
    class LocalFirefox
0
+      include Infrastructure
0
       def initialize
0
         @session = Selenium::SeleniumDriver.new("localhost", 4444, "*firefox", "http://localhost:4001", 10000)
0
         @infrastructure = RailsApplication.default, SeleniumRC.new, @session
0
       end
0
-      
0
-      def start
0
-        @infrastructure.each { |i| i.start }
0
-      end
0
-      
0
-      def stop
0
-        @infrastructure.reverse.each { |i| i.stop }
0
-      end
0
-      
0
-      def method_missing(method_name,*args)
0
-        if args.empty?
0
-           @session.send(method_name)
0
-        else
0
-           @session.send(method_name, *args)
0
-        end
0
+   end
0
+   
0
+   class GridIE6
0
+      include Infrastructure
0
+      def initialize
0
+        local_ip = IPSocket.getaddress(Socket.gethostname)
0
+        @session = Selenium::SeleniumDriver.new("localhost", 8444, "*custom /home/theo/bin/ie6", "http://#{local_ip}:4001", 10000)
0
+        @infrastructure = RailsApplication.default, VirtualBox.new, @session
0
       end
0
    end
0
    
0
    def default
0
-     LocalFirefox
0
+     GridIE6
0
    end
0
     
0
    extend(self)