diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-06 15:38:05 -0700 |
| commit | 4c4fd1a60ff1c060e76e9ee540074756510f53ea (patch) | |
| tree | 77da1c66c127e36c8b00825b676d9267a9ef4cd6 /railties/test/generators/app_generator_test.rb | |
| parent | 03cb74b9461293b96ae0add8ff5efda132dabba0 (diff) | |
| parent | af130575249571464ec984efa84fcea1267e8cf8 (diff) | |
| download | rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.gz rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.tar.bz2 rails-4c4fd1a60ff1c060e76e9ee540074756510f53ea.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 95ca2acf2c..64579c1205 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -51,6 +51,13 @@ class AppGeneratorTest < Rails::Generators::TestCase ).each{ |path| assert_file path } end + def test_application_controller_and_layout_files + run_generator + assert_file "app/controllers/application_controller.rb", /layout 'application'/ + assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag 'application'/ + assert_file "public/stylesheets/application.css" + end + def test_name_collision_raises_an_error content = capture(:stderr){ run_generator [File.join(destination_root, "generate")] } assert_equal "Invalid application name generate. Please give a name which does not match one of the reserved rails words.\n", content |