diff options
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. |