diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-20 13:56:01 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-20 13:56:01 -0700 |
| commit | f73c52c3bc6b67c68726b789131259bb44dbf958 (patch) | |
| tree | 7c5dd4324f26b6249d9a5f4a2ba263c4e043ce5b | |
| parent | 34c7e73c1def1312e59ef1f334586ff2f668246e (diff) | |
| parent | 2e5f49dcbfc7806afba9210e1758c54b42227e74 (diff) | |
| download | rails-f73c52c3bc6b67c68726b789131259bb44dbf958.tar.gz rails-f73c52c3bc6b67c68726b789131259bb44dbf958.tar.bz2 rails-f73c52c3bc6b67c68726b789131259bb44dbf958.zip | |
Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets
Don't generate a scaffold.css when --no-assets is specified
| -rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/scaffold_generator_test.rb | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 60a823de15..3a81e0861b 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 4.0.0 (unreleased) ## +* Don't generate a scaffold.css when --no-assets is specified + + *Kevin Glowacz* + * Add support for generate scaffold password:digest * adds password_digest attribute to the migration diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index 36589d65e2..2a0522e81c 100644 --- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -10,6 +10,7 @@ module Rails class_option :stylesheet_engine, desc: "Engine for Stylesheets" def handle_skip + @options = @options.merge(stylesheets: false) unless options[:assets] @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] end diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index b29d1e018e..25f299118c 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -241,7 +241,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase def test_scaffold_generator_no_assets run_generator [ "posts", "--no-assets" ] - assert_file "app/assets/stylesheets/scaffold.css" + assert_no_file "app/assets/stylesheets/scaffold.css" assert_no_file "app/assets/javascripts/posts.js" assert_no_file "app/assets/stylesheets/posts.css" end |