@@ -8,7 +8,7 @@ $LOAD_PATH << File.dirname(__FILE__) # ./spec # Spawn the server in another process -@server = fork do +@server = Thread.new do require 'simple_sinatra_server' Sinatra::Default.set( @@ -19,7 +19,8 @@ $LOAD_PATH << File.dirname(__FILE__) # ./spec end # Kill the server process when rspec finishes -at_exit { Process.kill("TERM", @server) } +at_exit { @server.exit } + # Give the app a change to initialize $stderr.puts "Waiting for thin to initialize..." spec/spec_helper.rb 6180fa801658ef2a63463170a7125549151800fd Paul Sadauskas psadauskas@gmail.com http://github.com/paul/resourceful/commit/f1b5205651702e184f2fc4c53d32f7f7dd5c6fec f1b5205651702e184f2fc4c53d32f7f7dd5c6fec 2009-04-03T14:32:27-07:00 2009-04-03T14:32:27-07:00 Rework server spawning to work correctly under rspec 1.2 1afc19e05e5f25650878677fa515ab42320049f7 Paul Sadauskas psadauskas@gmail.com