Permalink
Browse files

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

Fixes Scaffold generator with --assets=false
Conflicts:
	railties/CHANGELOG.md
  • Loading branch information...
rafaelfranca committed May 4, 2013
1 parent b2a02c8 commit d664409f3236fa028aee0c3c97dfc7586bd8c0c8
View
@@ -1,6 +1,9 @@
## unreleased ##
-* No changes.
+* Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
+ Fixes #9525.
+
+ *Arun Agrawal*
## Rails 4.0.0.rc1 (April 29, 2013) ##
@@ -8,6 +8,8 @@ class ScaffoldGenerator < ResourceGenerator # :nodoc:
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
def handle_skip
@options = @options.merge(stylesheets: false) unless options[:assets]
@@ -246,6 +246,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 d664409

Please sign in to comment.