diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 11:24:02 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 11:24:02 +1100 |
| commit | 186cd7bc530f705b889c27f3680ab48c7c10a6f3 (patch) | |
| tree | 76955e442615d77ee05ef2a8260c5373e1cac680 /railties/test/generators/actions_test.rb | |
| parent | 5f2395041d1578433fa825ed5c6f26a201f2203d (diff) | |
| parent | b9d4ceb43c9497fb1c47d8b1e1e6a24a9e157384 (diff) | |
| download | rails-186cd7bc530f705b889c27f3680ab48c7c10a6f3.tar.gz rails-186cd7bc530f705b889c27f3680ab48c7c10a6f3.tar.bz2 rails-186cd7bc530f705b889c27f3680ab48c7c10a6f3.zip | |
Merge branch 'rails'
Conflicts:
actionmailer/lib/action_mailer.rb
actionmailer/lib/action_mailer/delivery_method/smtp.rb
Diffstat (limited to 'railties/test/generators/actions_test.rb')
| -rw-r--r-- | railties/test/generators/actions_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb index 7d03a37f2a..b69f23c965 100644 --- a/railties/test/generators/actions_test.rb +++ b/railties/test/generators/actions_test.rb @@ -171,7 +171,7 @@ class ActionsTest < GeneratorsTestCase def test_route_should_add_data_to_the_routes_block_in_config_routes run_generator - route_command = "map.route '/login', :controller => 'sessions', :action => 'new'" + route_command = "route '/login', :controller => 'sessions', :action => 'new'" action :route, route_command assert_file 'config/routes.rb', /#{Regexp.escape(route_command)}/ end |