diff options
author | Robin Houston <robin.houston@gmail.com> | 2012-04-03 02:53:27 -0700 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2012-04-03 02:53:27 -0700 |
commit | a33c560ab2a3a6c1090dc0334b85c46b9f45c107 (patch) | |
tree | 50a47ab216c97667548be236b6a7f928bc535b5a /script | |
parent | 9ed1991310977986053ee11e3d13b487d6364d3c (diff) | |
parent | 74d74416d145a49c04f62ec9659f1a564251c1b6 (diff) |
Merge pull request #464 from jpmckinney/small-fixes
Small fixes
Diffstat (limited to 'script')
-rwxr-xr-x | script/handle-mail-replies | 2 | ||||
-rwxr-xr-x | script/spec_server | 4 |
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 } |