Merge branch 'develop' of github.com:sebbacon/alaveteli into develop

2 files changed, 3 insertions, 3 deletions

diff --git a/script/handle-mail-replies b/script/handle-mail-replies
index d6717bc58..cc7595bed 100755
--- a/script/handle-mail-replies
+++ b/script/handle-mail-replies
@@ -145,7 +145,7 @@ end
 
 def load_rails
     require File.join('config', 'boot')
-    require RAILS_ROOT + '/config/environment'
+    require Rails.root + '/config/environment'
 end
 
 def record_bounce(email_address, bounce_message)
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 }