From fe7c91220f705d165c608022d41c39f349239884 Mon Sep 17 00:00:00 2001 From: Christian Williams & Aaron Peckham Date: Fri, 10 Jul 2009 10:14:27 -0700 Subject: [PATCH] Exposing eval_js and more interface. --- contrib/ruby/jasmine_runner.rb | 101 +++++++++++++++++++++------ contrib/ruby/jasmine_spec_builder.rb | 19 +++-- 2 files changed, 90 insertions(+), 30 deletions(-) diff --git a/contrib/ruby/jasmine_runner.rb b/contrib/ruby/jasmine_runner.rb index e629491..109fa43 100644 --- a/contrib/ruby/jasmine_runner.rb +++ b/contrib/ruby/jasmine_runner.rb @@ -61,10 +61,16 @@ module Jasmine @driver.get_eval("window.jasmine.getEnv().currentRunner.finished") == "true" end - def run() + def connect @driver.start @driver.open("/run.html") + end + def disconnect + @driver.stop + end + + def run until tests_have_finished? do sleep 0.1 end @@ -73,6 +79,12 @@ module Jasmine failed_count = @driver.get_eval("window.jasmine.getEnv().currentRunner.getResults().failedCount").to_i failed_count == 0 end + + def eval_js(script) + escaped_script = "'" + script.gsub(/(['\\])/) { '\\' + $1 } + "'" + + @driver.get_eval("window.eval(#{escaped_script})") + end end class Runner @@ -80,36 +92,79 @@ module Jasmine @selenium_jar_path = selenium_jar_path @spec_files = spec_files @dir_mappings = dir_mappings + + @selenium_pid = nil + @jasmine_server_pid = nil + end + + def start + start_servers + @client = Jasmine::SimpleClient.new("localhost", @selenium_server_port, "*firefox", "http://localhost:#{@jasmine_server_port}/") + @client.connect + end + + def stop + @client.disconnect + stop_servers + end + + def server_is_listening_on(hostname, port) + require 'socket' + begin + socket = TCPSocket.open(hostname, port) + rescue Errno::ECONNREFUSED + return false + end + socket.close + true + end + + def wait_for_listener(port, name = "required process", seconds_to_wait = 10) + seconds_waited = 0 + until server_is_listening_on "localhost", port + sleep 1 + puts "Waiting for #{name} on #{port}..." + raise "#{name} didn't show up on port #{port} after #{seconds_to_wait} seconds." if (seconds_waited += 1) >= seconds_to_wait + end + end + + def start_servers + @jasmine_server_port = Jasmine::find_unused_port + @selenium_server_port = Jasmine::find_unused_port + + @selenium_pid = fork do + exec "java -jar #{@selenium_jar_path} -port #{@selenium_server_port}" + end + puts "selenium started. pid is #{@selenium_pid}" + + @jasmine_server_pid = fork do + Jasmine::SimpleServer.start(@jasmine_server_port, @spec_files, @dir_mappings) + end + puts "jasmine server started. pid is #{@jasmine_server_pid}" + + wait_for_listener(@selenium_server_port, "selenium server") + wait_for_listener(@jasmine_server_port, "jasmine server") + end + + def stop_servers + puts "shutting down the servers..." + Process.kill 15, @selenium_pid if @selenium_pid + Process.kill 15, @jasmine_server_pid if @jasmine_server_pid end def run - selenium_pid = nil - jasmine_server_pid = nil begin - jasmine_server_port = Jasmine::find_unused_port - selenium_server_port = Jasmine::find_unused_port - - selenium_pid = fork do - exec "java -jar #{@selenium_jar_path} -port #{selenium_server_port}" - end - puts "selenium started. pid is #{selenium_pid}" - - jasmine_server_pid = fork do - Jasmine::SimpleServer.start(jasmine_server_port, @spec_files, @dir_mappings) - end - puts "jasmine server started. pid is #{jasmine_server_pid}" - - wait_for_listener(selenium_server_port, "selenium server") - wait_for_listener(jasmine_server_port, "jasmine server") - + start puts "servers are listening on their ports -- running the test script..." - tests_passed = Jasmine::SimpleClient.new("localhost", selenium_server_port, "*firefox", "http://localhost:#{jasmine_server_port}/").run + tests_passed = @client.run ensure - puts "shutting down the servers..." - Process.kill 15, selenium_pid if selenium_pid - Process.kill 15, jasmine_server_pid if jasmine_server_pid + stop end return tests_passed end + + def eval_js(script) + @client.eval_js(script) + end end end diff --git a/contrib/ruby/jasmine_spec_builder.rb b/contrib/ruby/jasmine_spec_builder.rb index c9af0fd..22f4d16 100644 --- a/contrib/ruby/jasmine_spec_builder.rb +++ b/contrib/ruby/jasmine_spec_builder.rb @@ -5,11 +5,16 @@ module Jasmine class RemoteResults attr_accessor :suites - def initialize(spec_files) + def initialize(spec_files, runner) @spec_files = spec_files + @runner = runner + guess_example_locations + + @runner.start load_suite_info @spec_results = {} + end def script_path @@ -41,21 +46,21 @@ module Jasmine end def load_suite_info - while eval('typeof reportingBridge == "undefined" || !!!reportingBridge.suiteInfoReady') do + while eval_js('typeof reportingBridge == "undefined" || !!!reportingBridge.suiteInfoReady') do sleep 0.1 end - @suites = eval('Object.toJSON(reportingBridge.suiteInfo)') + @suites = eval_js('Object.toJSON(reportingBridge.suiteInfo)') end def results_for(spec_id) spec_id = spec_id.to_s return @spec_results[spec_id] if @spec_results[spec_id] - @spec_results[spec_id] = eval("Object.toJSON(reportingBridge.specResults[#{spec_id}])") + @spec_results[spec_id] = eval_js("Object.toJSON(reportingBridge.specResults[#{spec_id}])") while @spec_results[spec_id].nil? do sleep 0.1 - @spec_results[spec_id] = eval("Object.toJSON(reportingBridge.specResults[#{spec_id}])") + @spec_results[spec_id] = eval_js("Object.toJSON(reportingBridge.specResults[#{spec_id}])") end @spec_results[spec_id] @@ -104,8 +109,8 @@ module Jasmine private - def eval(js) - @runner.eval(js) + def eval_js(js) + @runner.eval_js(js) end end end