diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-05 07:06:50 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-05 07:06:50 -0700 |
| commit | d0096e035d43b5e5df711f0ba63f1dd95e62bb83 (patch) | |
| tree | a56f1abfd4c033cd218c0994cff0b6c2a5c6cd0f | |
| parent | dd76a49602705229addd80e926ccd2e33f92bd31 (diff) | |
| parent | 9e8c4679456680faedef9eda79bc09c7716bca99 (diff) | |
| download | rails-d0096e035d43b5e5df711f0ba63f1dd95e62bb83.tar.gz rails-d0096e035d43b5e5df711f0ba63f1dd95e62bb83.tar.bz2 rails-d0096e035d43b5e5df711f0ba63f1dd95e62bb83.zip | |
Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets
Fix tests related to scaffolding generator with --assets=false switch
| -rw-r--r-- | railties/test/generators/scaffold_generator_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index e3dc323b24..d5ad978986 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -239,21 +239,21 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase assert_file "config/routes.rb", /\.routes\.draw do\s*\|map\|\s*$/ end - def test_scaffold_generator_no_assets + def test_scaffold_generator_no_assets_with_switch_no_assets run_generator [ "posts", "--no-assets" ] 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 - def test_scaffold_generator_no_assets + def test_scaffold_generator_no_assets_with_switch_assets_false run_generator [ "posts", "--assets=false" ] - 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 - def test_scaffold_generator_no_assets + def test_scaffold_generator_no_assets_with_switch_resource_route_false run_generator [ "posts", "--resource-route=false" ] assert_file "config/routes.rb" do |route| assert_no_match(/resources :posts$/, route) |