diff options
| author | wycats <wycats@gmail.com> | 2010-09-11 03:24:50 -0500 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-09-11 03:24:50 -0500 |
| commit | f6153f74da29f56017d5ddb8a2b8869d9b5835d7 (patch) | |
| tree | 39de2f1a37cc755ed0e0950c012b47c61427bf83 /railties/test/application | |
| parent | 477df63433d8543ae8568de149e70d1bf1b41bb8 (diff) | |
| parent | 497b6af8818f656fdbca9ed2470c1c16ae5ff1cd (diff) | |
| download | rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.gz rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.bz2 rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.zip | |
Merge remote branch 'drogus/engines'
Diffstat (limited to 'railties/test/application')
| -rw-r--r-- | railties/test/application/initializers/frameworks_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/routing_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb index 61340e82c3..6970ea7b7a 100644 --- a/railties/test/application/initializers/frameworks_test.rb +++ b/railties/test/application/initializers/frameworks_test.rb @@ -61,7 +61,7 @@ module ApplicationTests require "#{app_path}/config/environment" assert Foo.method_defined?(:foo_path) - assert Foo.method_defined?(:app) + assert Foo.method_defined?(:main_app) assert_equal ["notify"], Foo.action_methods end diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb index d0c6cb51ca..b4ff14409f 100644 --- a/railties/test/application/routing_test.rb +++ b/railties/test/application/routing_test.rb @@ -203,7 +203,7 @@ module ApplicationTests assert_equal 'bar', last_response.body app_file 'config/routes.rb', <<-RUBY - AppTemplate::Application.routes.draw do |map| + AppTemplate::Application.routes.draw do match 'foo', :to => 'foo#baz' end RUBY |