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 /spec | |
parent | 9ed1991310977986053ee11e3d13b487d6364d3c (diff) | |
parent | 74d74416d145a49c04f62ec9659f1a564251c1b6 (diff) |
Merge pull request #464 from jpmckinney/small-fixes
Small fixes
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/request_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/script/handle-mail-replies_spec.rb | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 894dbda69..81c69db76 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -566,7 +566,7 @@ end # XXX do this for invalid ids # it "should render 404 file" do -# response.should render_template("#{RAILS_ROOT}/public/404.html") +# response.should render_template("#{Rails.root}/public/404.html") # response.headers["Status"].should == "404 Not Found" # end diff --git a/spec/script/handle-mail-replies_spec.rb b/spec/script/handle-mail-replies_spec.rb index 8ed83b31f..ad58ea565 100644 --- a/spec/script/handle-mail-replies_spec.rb +++ b/spec/script/handle-mail-replies_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require "external_command" def mail_reply_test(email_filename) - Dir.chdir RAILS_ROOT do + Dir.chdir Rails.root do xc = ExternalCommand.new("script/handle-mail-replies", "--test") xc.run(load_file_fixture(email_filename)) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c00da48bc..99cf8a2c8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -43,7 +43,7 @@ Spec::Runner.configure do |config| # # You can also declare which fixtures to use (for example fixtures for test/fixtures): # - # config.fixture_path = RAILS_ROOT + '/spec/fixtures/' + # config.fixture_path = Rails.root + '/spec/fixtures/' # # == Mock Framework # |