kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't generate a scaffold.css if no-assets

Browse source
This commit is contained in:
Kevin Glowacz 2013-03-20 15:09:15 -05:00
parent 34c7e73c1d
commit 2e5f49dcbf
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
railties/CHANGELOG.md
View file

@ -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

1
railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
View file

@ -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

2
railties/test/generators/scaffold_generator_test.rb
View file

@ -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