From 9e8c4679456680faedef9eda79bc09c7716bca99 Mon Sep 17 00:00:00 2001
From: Prathamesh Sonpatki <csonpatki@gmail.com>
Date: Sun, 5 May 2013 11:33:27 +0530
Subject: Fixes warning 'method redefined' in scaffold generators tests
- f1805a697831 Redefined 'test_scaffold_generator_no_assets' twice.
- Only the last instance of these three definitions of the same method
was getting called when the tests were actually running.
- This commit changes names of this method so that all three
definitions will be called
- scaffold.css is not generated by --assets=false switch.
- Test was expecting the presence of the file with --assets=false
- This issue was not discovered in f1805a697831b because it was
redefining the same method twice
---
railties/test/generators/scaffold_generator_test.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'railties')
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)
--
cgit v1.2.3