diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-23 01:29:29 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-23 01:29:29 +0100 |
commit | 98240c49b05093d6d14b9384a9bd695b58eefb59 (patch) | |
tree | 8db75608481547569fe86b105d7af30017617d69 /railties/test/initializer | |
parent | c8cc8a987213bf90fe6922517d52befb7c0587a8 (diff) | |
download | rails-98240c49b05093d6d14b9384a9bd695b58eefb59.tar.gz rails-98240c49b05093d6d14b9384a9bd695b58eefb59.tar.bz2 rails-98240c49b05093d6d14b9384a9bd695b58eefb59.zip |
Get rid of initializers global and create i18n railtie.
Diffstat (limited to 'railties/test/initializer')
-rw-r--r-- | railties/test/initializer/initialize_i18n_test.rb | 3 | ||||
-rw-r--r-- | railties/test/initializer/path_test.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/test/initializer/initialize_i18n_test.rb b/railties/test/initializer/initialize_i18n_test.rb index 472566378d..904d2a6566 100644 --- a/railties/test/initializer/initialize_i18n_test.rb +++ b/railties/test/initializer/initialize_i18n_test.rb @@ -15,6 +15,7 @@ module InitializerTests config.root = "#{app_path}" config.i18n.load_path << "my/other/locale.yml" RUBY + require "#{app_path}/config/environment" #{RAILS_FRAMEWORK_ROOT}/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml @@ -23,8 +24,8 @@ module InitializerTests #{RAILS_FRAMEWORK_ROOT}/activemodel/lib/active_model/locale/en.yml #{RAILS_FRAMEWORK_ROOT}/activerecord/lib/active_record/locale/en.yml #{RAILS_FRAMEWORK_ROOT}/actionpack/lib/action_view/locale/en.yml - #{RAILS_FRAMEWORK_ROOT}/railties/tmp/app/config/locales/en.yml my/other/locale.yml + #{RAILS_FRAMEWORK_ROOT}/railties/tmp/app/config/locales/en.yml ).map { |path| File.expand_path(path) }, I18n.load_path.map { |path| File.expand_path(path) } end diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb index 76eb29bdf4..4f475fae11 100644 --- a/railties/test/initializer/path_test.rb +++ b/railties/test/initializer/path_test.rb @@ -45,7 +45,7 @@ module InitializerTests assert_path @paths.tmp, "tmp" assert_path @paths.tmp.cache, "tmp", "cache" assert_path @paths.config, "config" - assert_path @paths.config.locales, "config", "locales" + assert_path @paths.config.locales, "config", "locales", "en.yml" assert_path @paths.config.environment, "config", "environments", "development.rb" assert_equal root("app", "controllers"), @paths.app.controllers.to_a.first |