aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/test_unit/controller
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2015-12-13 21:24:40 -0500
committereileencodes <eileencodes@gmail.com>2015-12-13 21:24:40 -0500
commit2dd64a7bbb0cb7b65976cb0516d0f338b099a715 (patch)
treeb98866b4907df6b988b7183474f732cf724a369c /railties/lib/rails/generators/test_unit/controller
parent0b224ddd552dbe87280dfdd1eb7a8f25d7d4e062 (diff)
downloadrails-2dd64a7bbb0cb7b65976cb0516d0f338b099a715.tar.gz
rails-2dd64a7bbb0cb7b65976cb0516d0f338b099a715.tar.bz2
rails-2dd64a7bbb0cb7b65976cb0516d0f338b099a715.zip
Revert "Merge pull request #22569 from seuros/remove-test-case"
This reverts commit 9712a7a12b7f9e4dcef751ceda8a73c3f4beb11f, reversing changes made to 3e65c3d3886336e9145438cdeacaf4ebec6a48b8. Reverting because this caused test failures and while we have a followup branch there is still one failure that happens randomly and isn't straight forward to fix.
Diffstat (limited to 'railties/lib/rails/generators/test_unit/controller')
-rw-r--r--railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb4
1 files changed, 2 insertions, 2 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 62c7e2f011..5a8a3ca5e0 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,7 +1,7 @@
require 'test_helper'
<% module_namespacing do -%>
-class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
+class <%= class_name %>ControllerTest < ActionController::TestCase
<% if mountable_engine? -%>
setup do
@routes = Engine.routes
@@ -15,7 +15,7 @@ class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
<% else -%>
<% actions.each do |action| -%>
test "should get <%= action %>" do
- get url_for(action: :<%= action %>)
+ get :<%= action %>
assert_response :success
end