aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-03-20 13:56:01 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-03-20 13:56:01 -0700
commitf73c52c3bc6b67c68726b789131259bb44dbf958 (patch)
tree7c5dd4324f26b6249d9a5f4a2ba263c4e043ce5b /railties/test/generators
parent34c7e73c1def1312e59ef1f334586ff2f668246e (diff)
parent2e5f49dcbfc7806afba9210e1758c54b42227e74 (diff)
downloadrails-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
Diffstat (limited to 'railties/test/generators')
-rw-r--r--railties/test/generators/scaffold_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
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