diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-18 16:53:25 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-18 16:53:25 +0000 |
| commit | 11ffeaf0bb03c505b5fac8d977a93c422d4f681e (patch) | |
| tree | 478c78a2f78f06d59fc6a8f4bbdd7d60dd989a5d /railties | |
| parent | bb817f1ed474b91e24ff7b661cd1d8c0635786d8 (diff) | |
| download | rails-11ffeaf0bb03c505b5fac8d977a93c422d4f681e.tar.gz rails-11ffeaf0bb03c505b5fac8d977a93c422d4f681e.tar.bz2 rails-11ffeaf0bb03c505b5fac8d977a93c422d4f681e.zip | |
Fixed functional test path problems #662
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@663 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
2 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 fcc3efd485..abe9c4cf8c 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,4 +1,4 @@ -require File.dirname(__FILE__) + <%= '/..' * class_nesting_depth %> + '/../test_helper' +require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper' require '<%= file_path %>_controller' # Re-raise errors caught by the controller. diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb index 1d45f23958..cbd89d1b4c 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + <%= '/..' * controller_class_nesting_depth %> + '/../test_helper' +require File.dirname(__FILE__) + '<%= '/..' * controller_class_nesting_depth %>/../test_helper' require '<%= controller_file_path %>_controller' # Re-raise errors caught by the controller. |