aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/initializer_test.rb7
-rw-r--r--railties/test/initializer_test.rb7
2 files changed, 7 insertions, 7 deletions
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 6de07b4122..c57ed08fdc 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -55,6 +55,13 @@ module ApplicationTests
assert Zoo
end
+ test "setting another default locale" do
+ Rails::Initializer.run do |config|
+ config.i18n.default_locale = :de
+ end
+ assert_equal :de, I18n.default_locale
+ end
+
test "load environment with global" do
app_file "config/environments/development.rb", "$initialize_test_set_from_env = 'success'"
assert_nil $initialize_test_set_from_env
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 219c65e637..e1c497c8a8 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -286,13 +286,6 @@ class InitializerSetupI18nTests < Test::Unit::TestCase
assert_equal [ "my/test/locale.yml", "my/other/locale.yml" ], config.i18n.load_path
end
-
- def test_setting_another_default_locale
- config = Rails::Configuration.new
- config.i18n.default_locale = :de
- Rails::Initializer.run(:initialize_i18n, config)
- assert_equal :de, I18n.default_locale
- end
end
class InitializerDatabaseMiddlewareTest < Test::Unit::TestCase