diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-21 20:41:25 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-21 20:41:25 -0600 |
| commit | 1de95077dc3bfc7589ca85dc31d46a1ea6db7650 (patch) | |
| tree | 1d59980c564e7f917bddc4d5768c1544e971c596 /railties/test/plugins/configuration_test.rb | |
| parent | 426348b48403f664cc10e8ec545b640e56c1c090 (diff) | |
| parent | 2e571e8f99e5e2712c0bc2558df8d62996204b03 (diff) | |
| download | rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.tar.gz rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.tar.bz2 rails-1de95077dc3bfc7589ca85dc31d46a1ea6db7650.zip | |
Merge branch 'master' of github.com:rails/rails
Conflicts:
railties/test/initializer/initialize_i18n_test.rb
railties/test/initializer/path_test.rb
Diffstat (limited to 'railties/test/plugins/configuration_test.rb')
| -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 |