Add --no-html to scaffold generator

2 files changed, 17 insertions, 0 deletions

diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 57a12d0457..f13305adb0 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -127,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"]
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index de62fdb1ea..f3f2c170ee 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -257,6 +257,11 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     assert_no_file "app/assets/stylesheets/posts.css"
   end
 
+  def test_scaffold_generator_no_html
+    run_generator [ "posts", "--no-html" ]
+    assert_no_file "app/assets/stylesheets/scaffold.css"
+  end
+
   def test_scaffold_generator_no_javascripts
     run_generator [ "posts", "--no-javascripts" ]
     assert_file "app/assets/stylesheets/scaffold.css"