Ticket #11419: patch.txt

Index: C:/Users/Admin/Desktop/short/vendor/plugins/javascript_test/lib/javascript_test.rb
===================================================================
--- C:/Users/Admin/Desktop/short/vendor/plugins/javascript_test/lib/javascript_test.rb  (revision 74)
+++ C:/Users/Admin/Desktop/short/vendor/plugins/javascript_test/lib/javascript_test.rb  (working copy)
@@ -5,6 +5,14 @@
 class JavaScriptTest
   
   class Browser
+    def initialize(path='')
+      @path = path
+    end
+    
+    def validate_path
+      raise "Not found #{@path}" if windows? && !File.exists?(@path)
+    end
+    
     def supported?; true; end
     def setup ; end
     def open(url) ; end
@@ -35,12 +43,13 @@
   
   class FirefoxBrowser < Browser
     def initialize(path='c:\Program Files\Mozilla Firefox\firefox.exe')
-      @path = path
+      super path
+       validate_path
     end
@@ -73,7 +82,8 @@
   
   class IEBrowser < Browser
     def initialize(path='C:\Program Files\Internet Explorer\IEXPLORE.EXE')
-      @path = path
+      super path
+       validate_path
     end
     
     def setup
@@ -149,8 +159,9 @@
       @queue = Queue.new
   
       result = []
-  
-      @server = WEBrick::HTTPServer.new(:Port => 4711) # TODO: make port configurable
+     
+      @port = 4711# TODO: make port configurable
+      @server = WEBrick::HTTPServer.new(:Port => @port) 
       @server.mount_proc("/results") do |req, res|
         @queue.push(req.query['result'])
         res.body = "OK"
@@ -165,7 +176,7 @@
     end
   
     def define
-      trap("INT") { @server.shutdown }
+      trap_init {@server.shutdown}
       t = Thread.new { @server.start }
       
       # run all combinations of browsers and tests
@@ -173,12 +184,15 @@
         if browser.supported?
           browser.setup
           @tests.each do |test|
-            browser.visit("http://localhost:4711#{test}?resultsURL=http://localhost:4711/results&t=" + ("%.6f" % Time.now.to_f))
-            result = @queue.pop
-            puts "#{test} on #{browser}: #{result}"
+             puts "#{test} on #{browser}:"
+            
+             #run test
+             browser.visit("http://localhost:#{@port}#{test}?resultsURL=http://localhost:#{@port}/results&t=" + ("%.6f" % Time.now.to_f))
+             result = @queue.pop
+            
+             puts result
             @result = false unless result == 'SUCCESS'
           end
-          browser.teardown
         else
           puts "Skipping #{browser}, not supported on this OS"
         end
@@ -188,6 +202,19 @@
       @server.shutdown
       t.join
     end
+    
+    def trap_init
+       trap("INT") do
+         exit if @int_received_once
+        
+        @int_received_once = true
+        puts %{
+          Shutting down, please wait... 
+          Hitting ctr+c again will exit the process but leave the server running!
+        }
+        yield
+      end  
+    end
   
     def mount(path, dir=nil)
       dir ||= (Dir.pwd + path)
@@ -203,23 +230,15 @@
       end
       @tests << url
     end
+ 
+    def browser(browser,path='')
+      begin
+         browser = eval("#{browser.to_s.capitalize}Browser.new" + (path.empty? ? '':' path'))
+        @browsers<<browser
+      rescue
+         puts $!
+      end
   
-    def browser(browser)
-      browser =
-        case(browser)
-          when :firefox
-            FirefoxBrowser.new
-          when :safari
-            SafariBrowser.new
-          when :ie
-            IEBrowser.new
-          when :konqueror
-            KonquerorBrowser.new
-          else
-            browser
-        end
-  
-      @browsers<<browser
     end
   end