diff options
| author | eileencodes <eileencodes@gmail.com> | 2015-12-15 15:20:44 -0500 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2015-12-15 15:20:44 -0500 |
| commit | 89f776402dbaca581ef4bb342bb89db922124c7a (patch) | |
| tree | 412ef453bab51877b3b5f0847f8904af3be614e1 /railties/lib/rails/generators/test_unit/controller/templates | |
| parent | f8edd2043e864aff0bde9289da550709532268a6 (diff) | |
| parent | becf1bcb1d6e72e782995507ebc89d75db357184 (diff) | |
| download | rails-89f776402dbaca581ef4bb342bb89db922124c7a.tar.gz rails-89f776402dbaca581ef4bb342bb89db922124c7a.tar.bz2 rails-89f776402dbaca581ef4bb342bb89db922124c7a.zip | |
Merge branch 'remove-test-case'
Diffstat (limited to 'railties/lib/rails/generators/test_unit/controller/templates')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb index 5a8a3ca5e0..4f2ceb8589 100644 --- a/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb +++ b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb @@ -1,11 +1,9 @@ require 'test_helper' <% module_namespacing do -%> -class <%= class_name %>ControllerTest < ActionController::TestCase +class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest <% if mountable_engine? -%> - setup do - @routes = Engine.routes - end + include Engine.routes.url_helpers <% end -%> <% if actions.empty? -%> @@ -15,7 +13,7 @@ class <%= class_name %>ControllerTest < ActionController::TestCase <% else -%> <% actions.each do |action| -%> test "should get <%= action %>" do - get :<%= action %> + get <%= file_name %>_<%= action %>_url assert_response :success end |