aboutsummaryrefslogtreecommitdiffstats
path: root/script/spec_server
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-04-27 10:18:48 +0100
committerRobin Houston <robin.houston@gmail.com>2012-04-27 10:18:48 +0100
commita7d0d25b323d9ca7f31405482f9462570e0cbeaf (patch)
tree644b8f34e0ca59ae0262c1a936ab65b737b0fcc4 /script/spec_server
parent3a18daf0b880ad9f7ee3591c3c777edfd5688b34 (diff)
parent6df23e10dfbf3351d3953f99062d46253b5ec94a (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'script/spec_server')
-rwxr-xr-xscript/spec_server4
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 }