diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-22 23:52:02 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-22 23:52:02 +0100 |
| commit | 21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd (patch) | |
| tree | bfec5946303ceb582674904c5f9927e9b4020272 /railties/test/initializer_test.rb | |
| parent | 91ab75373f13054485f5d804d7e2c80d466ff5e0 (diff) | |
| parent | 441e4e22352c8805a882f6a661ab3982dd7eda12 (diff) | |
| download | rails-21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd.tar.gz rails-21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd.tar.bz2 rails-21b80f8144f8f05a105b2989c79d3ed2f2d0d4cd.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/test/initializer_test.rb')
| -rw-r--r-- | railties/test/initializer_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb index 2ab4101eaf..eb9ec750da 100644 --- a/railties/test/initializer_test.rb +++ b/railties/test/initializer_test.rb @@ -182,6 +182,7 @@ require File.dirname(__FILE__) + '/plugin_test_helper' class InitializerPluginLoadingTests < Test::Unit::TestCase def setup @configuration = Rails::Configuration.new + @configuration.frameworks -= [:action_mailer] @configuration.plugin_paths << plugin_fixture_root_path @initializer = Rails::Initializer.new(@configuration) @valid_plugin_path = plugin_fixture_path('default/stubby') @@ -310,8 +311,8 @@ class InitializerSetupI18nTests < Test::Unit::TestCase Rails::Initializer.run(:initialize_i18n, config) assert_equal [ - File.expand_path("./test/../../activesupport/lib/active_support/locale/en.yml"), - File.expand_path("./test/../../actionpack/lib/action_view/locale/en.yml"), + File.expand_path(File.dirname(__FILE__) + "/../../activesupport/lib/active_support/locale/en.yml"), + File.expand_path(File.dirname(__FILE__) + "/../../actionpack/lib/action_view/locale/en.yml"), "my/test/locale.yml", "my/other/locale.yml" ], I18n.load_path.collect { |path| path =~ /^\./ ? File.expand_path(path) : path } end |