Skip to content
Browse files

Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master

Fixes Scaffold generator with --assets=false
Conflicts:
	railties/CHANGELOG.md

Conflicts:
	railties/CHANGELOG.md
	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
  • Loading branch information...
1 parent 9d7a748 commit 927a04da40b3d9b97cb23be7c0820eee629f0f7a @rafaelfranca rafaelfranca committed May 4, 2013
View
5 railties/CHANGELOG.md
@@ -1,6 +1,9 @@
## unreleased ##
-* No changes.
+* Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
+ Fixes #9525.
+
+ *Arun Agrawal*
## Rails 3.2.13 (Mar 18, 2013) ##
View
2 railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -8,6 +8,8 @@ class ScaffoldGenerator < ResourceGenerator #metagenerator
class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
+ class_option :assets, :type => :boolean
+ class_option :resource_route, :type => :boolean
hook_for :scaffold_controller, :required => true
View
14 railties/test/generators/scaffold_generator_test.rb
@@ -276,6 +276,20 @@ def test_scaffold_generator_no_assets
assert_no_file "app/assets/stylesheets/posts.css"
end
+ def test_scaffold_generator_no_assets
+ run_generator [ "posts", "--assets=false" ]
+ assert_file "app/assets/stylesheets/scaffold.css"
+ assert_no_file "app/assets/javascripts/posts.js"
+ assert_no_file "app/assets/stylesheets/posts.css"
+ end
+
+ def test_scaffold_generator_no_assets
+ run_generator [ "posts", "--resource-route=false" ]
+ assert_file "config/routes.rb" do |route|
+ assert_no_match(/resources :posts$/, route)
+ end
+ end
+
def test_scaffold_generator_no_stylesheets
run_generator [ "posts", "--no-stylesheets" ]
assert_no_file "app/assets/stylesheets/scaffold.css"

0 comments on commit 927a04d

Please sign in to comment.
Something went wrong with that request. Please try again.