diff options
| author | masarakki <masaki@hisme.net> | 2015-06-09 04:38:46 +0900 |
|---|---|---|
| committer | masarakki <masaki@hisme.net> | 2015-06-09 04:41:19 +0900 |
| commit | 83b7bf4d3bdb4bc84cbbc5d2859951f5e534e2c2 (patch) | |
| tree | ca56613443cda48267ca987420f61327ae6f0445 | |
| parent | a69e0a5fcfbcd76f259ab1ed290fafa8726b44ba (diff) | |
| download | rails-83b7bf4d3bdb4bc84cbbc5d2859951f5e534e2c2.tar.gz rails-83b7bf4d3bdb4bc84cbbc5d2859951f5e534e2c2.tar.bz2 rails-83b7bf4d3bdb4bc84cbbc5d2859951f5e534e2c2.zip | |
add option to avoid generating scaffold.css
| -rw-r--r-- | railties/lib/rails/generators.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 3 | ||||
| -rw-r--r-- | railties/test/generators/scaffold_generator_test.rb | 14 |
3 files changed, 18 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index a7da92168d..79088bbe3c 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -33,6 +33,7 @@ module Rails scaffold_controller: '-c', stylesheets: '-y', stylesheet_engine: '-se', + scaffold_stylesheet: '-ss', template_engine: '-e', test_framework: '-t' }, @@ -56,6 +57,7 @@ module Rails scaffold_controller: :scaffold_controller, stylesheets: true, stylesheet_engine: :css, + scaffold_stylesheet: true, test_framework: false, template_engine: :erb } diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index e89789e72b..17c32bfdb3 100644 --- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -10,10 +10,11 @@ module Rails class_option :stylesheet_engine, desc: "Engine for Stylesheets" class_option :assets, type: :boolean class_option :resource_route, type: :boolean + class_option :scaffold_stylesheet, type: :boolean def handle_skip @options = @options.merge(stylesheets: false) unless options[:assets] - @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] + @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet] end hook_for :scaffold_controller, required: true diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index 8f43747b9e..8d7fea8741 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -282,6 +282,20 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase assert_no_file "app/assets/stylesheets/posts.css" end + def test_scaffold_generator_no_scaffold_stylesheet_with_switch_no_scaffold_stylesheet + run_generator [ "posts", "--no-scaffold-stylesheet" ] + assert_no_file "app/assets/stylesheets/scaffold.css" + assert_file "app/assets/javascripts/posts.js" + assert_file "app/assets/stylesheets/posts.css" + end + + def test_scaffold_generator_no_scaffold_stylesheet_with_switch_scaffold_stylesheet_false + run_generator [ "posts", "--scaffold-stylesheet=false" ] + assert_no_file "app/assets/stylesheets/scaffold.css" + assert_file "app/assets/javascripts/posts.js" + assert_file "app/assets/stylesheets/posts.css" + end + def test_scaffold_generator_with_switch_resource_route_false run_generator [ "posts", "--resource-route=false" ] assert_file "config/routes.rb" do |route| |