diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-23 00:52:34 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-23 00:52:34 +0000 |
commit | 4ff4afa57949e6a7a4d3d200531932207f97da8e (patch) | |
tree | 3546444b022426e7324b667fe8662c88ed6b0775 /railties/generators/controller/templates/functional_test.rb | |
parent | 4ce65f434a29460aebcd2eaa511d85f0ff6bb18a (diff) | |
download | rails-4ff4afa57949e6a7a4d3d200531932207f97da8e.tar.gz rails-4ff4afa57949e6a7a4d3d200531932207f97da8e.tar.bz2 rails-4ff4afa57949e6a7a4d3d200531932207f97da8e.zip |
Added protection for creating a model through the generators with a name of an existing class, like Thread or Date. It'll even offer you a synonym using wordnet.princeton.edu as a look-up. No, I'm not kidding :) [Florian Gross]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@263 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/generators/controller/templates/functional_test.rb')
-rw-r--r-- | railties/generators/controller/templates/functional_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/generators/controller/templates/functional_test.rb b/railties/generators/controller/templates/functional_test.rb index c975cb3ce3..df75ad57e9 100644 --- a/railties/generators/controller/templates/functional_test.rb +++ b/railties/generators/controller/templates/functional_test.rb @@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../test_helper' require '<%= file_name %>_controller' # Re-raise errors caught by the controller. -class <%= class_name %>Controller; def rescue_action(e) raise e end; end +class <%= full_class_name %>; def rescue_action(e) raise e end; end -class <%= class_name %>ControllerTest < Test::Unit::TestCase +class <%= full_class_name %>Test < Test::Unit::TestCase def setup - @controller = <%= class_name %>Controller.new + @controller = <%= full_class_name %>.new @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new end |