1 files changed, 11 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index 18bd1ece9d..50b98b2631 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -3,13 +3,15 @@ require 'test_helper'
 <% module_namespacing do -%>
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   setup do
-    @<%= singular_table_name %> = <%= table_name %>(:one)
+    @<%= singular_table_name %> = <%= fixture_name %>(:one)
+<% if mountable_engine? -%>
+    @routes = Engine.routes
+<% end -%>
   end
 
   test "should get index" do
     get :index
     assert_response :success
-    assert_not_nil assigns(:<%= table_name %>)
   end
 
   test "should get new" do
@@ -19,30 +21,30 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
+      post :create, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
     end
 
-    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+    assert_redirected_to <%= singular_table_name %>_path(<%= class_name %>.last)
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, id: <%= "@#{singular_table_name}" %>
+    get :show, params: { id: <%= "@#{singular_table_name}" %> }
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: <%= "@#{singular_table_name}" %>
+    get :edit, params: { id: <%= "@#{singular_table_name}" %> }
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    patch :update, id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
-    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+    patch :update, params: { id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+    assert_redirected_to <%= singular_table_name %>_path(<%= "@#{singular_table_name}" %>)
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, id: <%= "@#{singular_table_name}" %>
+      delete :destroy, params: { id: <%= "@#{singular_table_name}" %> }
     end
 
     assert_redirected_to <%= index_helper %>_path