diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 12:33:36 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 12:33:36 -0700 |
| commit | a49c3b03650b3193cc9440a3b219ab7f19326297 (patch) | |
| tree | dd68d637a074bc08d1328d780aeb092b2a4c8874 /railties/test/generators/actions_test.rb | |
| parent | 028911ad00e7f7733064a80393a1548401bba7af (diff) | |
| parent | 1ac5cf478825391071d34ec3d7f294fe28c0fceb (diff) | |
| download | rails-a49c3b03650b3193cc9440a3b219ab7f19326297.tar.gz rails-a49c3b03650b3193cc9440a3b219ab7f19326297.tar.bz2 rails-a49c3b03650b3193cc9440a3b219ab7f19326297.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/test/generators/actions_test.rb')
| -rw-r--r-- | railties/test/generators/actions_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb index adc61f6d8a..199b5fa8b4 100644 --- a/railties/test/generators/actions_test.rb +++ b/railties/test/generators/actions_test.rb @@ -89,7 +89,7 @@ class ActionsTest < GeneratorsTestCase def test_environment_should_include_data_in_environment_initializer_block run_generator - load_paths = 'config.load_paths += %w["#{RAILS_ROOT}/app/extras"]' + load_paths = 'config.load_paths += %w["#{Rails.root}/app/extras"]' action :environment, load_paths assert_file 'config/application.rb', /#{Regexp.escape(load_paths)}/ end |