From ec8e747960da9c0413cb5da7834f458bc5dd8ce1 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 9 Apr 2010 10:04:20 -0700 Subject: Partially revert "A new application now comes with a layout and a stylesheet." This reverts commit ea2c5fa8046e2f953b366adc94f0610ccfea0828. Conflicts: railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb railties/test/generators/app_generator_test.rb --- railties/test/generators/scaffold_generator_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'railties/test/generators/scaffold_generator_test.rb') diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index 3cad65f503..e8e622fe5c 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -70,10 +70,14 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase show _form ).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" } + assert_no_file "app/views/layouts/product_lines.html.erb" # Helpers assert_file "app/helpers/product_lines_helper.rb" assert_file "test/unit/helpers/product_lines_helper_test.rb" + + # Stylesheets + assert_file "public/stylesheets/scaffold.css" end def test_scaffold_on_revoke @@ -97,9 +101,13 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase # Views assert_no_file "app/views/product_lines" + assert_no_file "app/views/layouts/product_lines.html.erb" # Helpers assert_no_file "app/helpers/product_lines_helper.rb" assert_no_file "test/unit/helpers/product_lines_helper_test.rb" + + # Stylesheets (should not be removed) + assert_file "public/stylesheets/scaffold.css" end end -- cgit v1.2.3