@@ -9,23 +9,27 @@ module RailsTestServing include Utilities - def initialize - ENV['RAILS_ENV'] = 'test' - log "** Test server starting [##{$$}]..." do - enable_dependency_tracking - start_cleaner - load_framework - end - install_signal_traps - end - def run(file, argv) GUARD.synchronize do + prepare perform_run(file, argv) end end private + + def prepare + @prepared ||= begin + ENV['RAILS_ENV'] = 'test' + log "** Test server starting [##{$$}]..." do + enable_dependency_tracking + start_cleaner + load_framework + end + install_signal_traps + true + end + end def enable_dependency_tracking require 'config/boot' @@ -55,8 +59,10 @@ module RailsTestServing def install_signal_traps log " - CTRL+C: Stop the server\n" trap(:INT) do - log "** Stopping the server..." do - DRb.thread.raise Interrupt, "stop" + GUARD.synchronize do + log "** Stopping the server..." do + DRb.thread.raise Interrupt, "stop" + end end end lib/rails_test_serving/server.rb @@ -70,12 +70,6 @@ class RailsTestServing::ServerTest < Test::Unit::TestCase private def stub_server - s = RailsTestServing::Server - s.any_instance.stubs(:log).yields - s.any_instance.stubs(:enable_dependency_tracking) - s.any_instance.stubs(:start_cleaner) - s.any_instance.stubs(:load_framework) - s.any_instance.stubs(:install_signal_traps) - s.new + RailsTestServing::Server.new end end test/rails_test_serving/server_test.rb 49f8251574be3a2ef0c4271bfa0fd5a07bc160c1 Roman Le Negrate roman.lenegrate@gmail.com http://github.com/Roman2K/rails-test-serving/commit/cd4c76103e2b3f8ed5bed022055c296c00b95151 cd4c76103e2b3f8ed5bed022055c296c00b95151 2008-12-27T11:46:32-08:00 2008-12-27T11:46:32-08:00 Start listening for test run requests as soon as possible. This allows for starting the server and immediately CMD+R'ing without having the environment loaded twice (once for the server, once for the independent process that couldn't connect to the server yet). 2f349a773c4d6d2a1f27aaa1b800c34558b93938 Roman Le Negrate roman.lenegrate@gmail.com