1 files changed, 50 insertions, 13 deletions
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 8cacca668f..ab00586a64 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -20,17 +20,13 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
         assert_match(/@users = User\.all/, m)
       end
 
-      assert_instance_method :show, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
-      end
+      assert_instance_method :show, content
 
       assert_instance_method :new, content do |m|
         assert_match(/@user = User\.new/, m)
       end
 
-      assert_instance_method :edit, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
-      end
+      assert_instance_method :edit, content
 
       assert_instance_method :create, content do |m|
         assert_match(/@user = User\.new\(user_params\)/, m)
@@ -39,21 +35,50 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :update, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
-        assert_match(/@user\.update_attributes\(user_params\)/, m)
+        assert_match(/@user\.update\(user_params\)/, m)
         assert_match(/@user\.errors/, m)
       end
 
       assert_instance_method :destroy, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
         assert_match(/@user\.destroy/, m)
       end
 
+      assert_instance_method :set_user, content do |m|
+        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
+      end
+
       assert_match(/def user_params/, content)
       assert_match(/params\.require\(:user\)\.permit\(:name, :age\)/, content)
     end
   end
 
+  def test_dont_use_require_or_permit_if_there_are_no_attributes
+    run_generator ["User"]
+
+    assert_file "app/controllers/users_controller.rb" do |content|
+      assert_match(/def user_params/, content)
+      assert_match(/params\[:user\]/, content)
+    end
+  end
+
+  def test_controller_permit_references_attributes
+    run_generator ["LineItem", "product:references", "cart:belongs_to"]
+
+    assert_file "app/controllers/line_items_controller.rb" do |content|
+      assert_match(/def line_item_params/, content)
+      assert_match(/params\.require\(:line_item\)\.permit\(:product_id, :cart_id\)/, content)
+    end
+  end
+
+  def test_controller_permit_polymorphic_references_attributes
+    run_generator ["LineItem", "product:references{polymorphic}"]
+
+    assert_file "app/controllers/line_items_controller.rb" do |content|
+      assert_match(/def line_item_params/, content)
+      assert_match(/params\.require\(:line_item\)\.permit\(:product_id, :product_type\)/, content)
+    end
+  end
+
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/
@@ -70,13 +95,13 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_functional_tests
-    run_generator
+    run_generator ["User", "name:string", "age:integer", "organization:references{polymorphic}"]
 
     assert_file "test/controllers/users_controller_test.rb" do |content|
       assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, user: \{ age: @user.age, name: @user.name \}/, content)
-      assert_match(/put :update, id: @user, user: \{ age: @user.age, name: @user.name \}/, content)
+      assert_match(/post :create, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \}/, content)
+      assert_match(/patch :update, id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \}/, content)
     end
   end
 
@@ -87,7 +112,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
       assert_match(/test "should get index"/, content)
       assert_match(/post :create, user: \{  \}/, content)
-      assert_match(/put :update, id: @user, user: \{  \}/, content)
+      assert_match(/patch :update, id: @user, user: \{  \}/, content)
     end
   end
 
@@ -102,6 +127,18 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     assert_no_file "app/views/layouts/users.html.erb"
   end
 
+  def test_skip_html_if_required
+    run_generator [ "User", "name:string", "age:integer", "--no-html" ]
+    assert_no_file "app/helpers/users_helper.rb"
+    assert_no_file "app/views/users"
+
+    assert_file "app/controllers/users_controller.rb" do |content|
+      assert_no_match(/format\.html/, content)
+      assert_no_match(/def edit/, content)
+      assert_no_match(/def new/, content)
+    end
+  end
+
   def test_default_orm_is_used
     run_generator ["User", "--orm=unknown"]