aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/i18n_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/test/i18n_test.rb')
-rw-r--r--activesupport/test/i18n_test.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/activesupport/test/i18n_test.rb b/activesupport/test/i18n_test.rb
index db5bd5e088..cfb8c76d52 100644
--- a/activesupport/test/i18n_test.rb
+++ b/activesupport/test/i18n_test.rb
@@ -6,11 +6,9 @@ class I18nTest < Test::Unit::TestCase
@time = Time.utc(2008, 7, 2, 16, 47, 1)
end
- uses_mocha 'I18nTimeZoneTest' do
- def test_time_zone_localization_with_default_format
- Time.zone.stubs(:now).returns Time.local(2000)
- assert_equal Time.zone.now.strftime("%a, %d %b %Y %H:%M:%S %z"), I18n.localize(Time.zone.now)
- end
+ def test_time_zone_localization_with_default_format
+ Time.zone.stubs(:now).returns Time.local(2000)
+ assert_equal Time.zone.now.strftime("%a, %d %b %Y %H:%M:%S %z"), I18n.localize(Time.zone.now)
end
def test_date_localization_should_use_default_format
@@ -83,9 +81,9 @@ class I18nTest < Test::Unit::TestCase
def test_to_sentence
assert_equal 'a, b, and c', %w[a b c].to_sentence
- I18n.backend.store_translations 'en-US', :support => { :array => { :skip_last_comma => true } }
+ I18n.backend.store_translations 'en', :support => { :array => { :skip_last_comma => true } }
assert_equal 'a, b and c', %w[a b c].to_sentence
ensure
- I18n.backend.store_translations 'en-US', :support => { :array => { :skip_last_comma => false } }
+ I18n.backend.store_translations 'en', :support => { :array => { :skip_last_comma => false } }
end
end