diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 19:35:13 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 19:35:13 +0000 |
| commit | b04618e707a73d2bcd617fd82e54e736736158b1 (patch) | |
| tree | 5091ba6b63486cfbb4eca4c349d224d208877567 /railties/lib/rails_generator/generators/components/controller | |
| parent | 575ad6d4451451add07190477cb55f6b1aa97c7d (diff) | |
| download | rails-b04618e707a73d2bcd617fd82e54e736736158b1.tar.gz rails-b04618e707a73d2bcd617fd82e54e736736158b1.tar.bz2 rails-b04618e707a73d2bcd617fd82e54e736736158b1.zip | |
Fixed generated functional test for nested controllers has wrong paths #635
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@631 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/generators/components/controller')
| -rw-r--r-- | railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb index 76e2b33ba5..fcc3efd485 100644 --- a/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb +++ b/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../test_helper' -require '<%= file_name %>_controller' +require File.dirname(__FILE__) + <%= '/..' * class_nesting_depth %> + '/../test_helper' +require '<%= file_path %>_controller' # Re-raise errors caught by the controller. class <%= class_name %>Controller; def rescue_action(e) raise e end; end |