diff options
author | David Cabo <david@calibea.com> | 2012-05-28 12:58:02 +0200 |
---|---|---|
committer | David Cabo <david@calibea.com> | 2012-05-28 12:58:02 +0200 |
commit | bc681f7270f5ddc40279981a15a0a7c7af250293 (patch) | |
tree | 5df68fe9a0a756d9821c560079271ed363bd3f18 /script/spec_server | |
parent | ba29eab41f51f3f489be7c5daf6d28449eab944f (diff) | |
parent | acde8a57e087d3058b8539e04c12e790866f8451 (diff) |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'script/spec_server')
-rwxr-xr-x | script/spec_server | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/script/spec_server b/script/spec_server index 1e839355f..dfdf8ff6c 100755 --- a/script/spec_server +++ b/script/spec_server @@ -41,7 +41,7 @@ module Spec load File.dirname(__FILE__) + '/../spec/spec_helper.rb' if in_memory_database? - load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default + load "#{Rails.root}/db/schema.rb" # use db agnostic schema by default ActiveRecord::Migrator.up('db/migrate') # use migrations end @@ -80,7 +80,7 @@ def daemonize(pid_file = nil) return yield if $DEBUG pid = Process.fork{ Process.setsid - Dir.chdir(RAILS_ROOT) + Dir.chdir(Rails.root) trap("SIGINT"){ exit! 0 } trap("SIGTERM"){ exit! 0 } trap("SIGHUP"){ restart_test_server } |