aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/initializers/frameworks_test.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-09-11 03:24:50 -0500
committerwycats <wycats@gmail.com>2010-09-11 03:24:50 -0500
commitf6153f74da29f56017d5ddb8a2b8869d9b5835d7 (patch)
tree39de2f1a37cc755ed0e0950c012b47c61427bf83 /railties/test/application/initializers/frameworks_test.rb
parent477df63433d8543ae8568de149e70d1bf1b41bb8 (diff)
parent497b6af8818f656fdbca9ed2470c1c16ae5ff1cd (diff)
downloadrails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.gz
rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.bz2
rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.zip
Merge remote branch 'drogus/engines'
Diffstat (limited to 'railties/test/application/initializers/frameworks_test.rb')
-rw-r--r--railties/test/application/initializers/frameworks_test.rb2
1 files changed, 1 insertions, 1 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