diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-22 08:26:00 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-22 08:26:00 +0100 |
| commit | 4b8330d2d50ae4de14dd43ffbea4d91804553140 (patch) | |
| tree | 8d925e361688cf09ab6e3fe8df6b9609a69ffa83 /railties/test/plugins | |
| parent | 5f34421c77b4cd873baadbbca877a93de5a4d602 (diff) | |
| parent | 8e48a5ef0ca488b2264acd2b38bdae14970c011f (diff) | |
| download | rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.tar.gz rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.tar.bz2 rails-4b8330d2d50ae4de14dd43ffbea4d91804553140.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/test/plugins')
| -rw-r--r-- | railties/test/plugins/configuration_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/plugins/configuration_test.rb b/railties/test/plugins/configuration_test.rb index edf8bb37f5..5786316d1d 100644 --- a/railties/test/plugins/configuration_test.rb +++ b/railties/test/plugins/configuration_test.rb @@ -21,7 +21,7 @@ module PluginsTest test "plugin configurations are available in the application" do class Foo < Rails::Plugin ; config.foo.greetings = "hello" ; end require "#{app_path}/config/application" - assert_equal "hello", AppTemplate.config.foo.greetings + assert_equal "hello", AppTemplate::Application.config.foo.greetings end test "plugin config merges are deep" do @@ -33,4 +33,4 @@ module PluginsTest assert_equal "bar", MyApp.config.foo.bar end end -end
\ No newline at end of file +end |