X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1e9a3f8664a1715e59211d25dd7168b95b85fe72..927cc9f45e6626e2a82403d1263b4a16d601e30b:/test/helpers/user_blocks_helper_test.rb
diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb
index de5ff1c6a..db4fd87a4 100644
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -1,42 +1,36 @@
-# coding: utf-8
require "test_helper"
class UserBlocksHelperTest < ActionView::TestCase
include ApplicationHelper
- def setup
- I18n.locale = "en"
- end
- def teardown
- I18n.locale = "en"
+ def test_block_status
+ block = create(:user_block, :needs_view, :ends_at => Time.now.utc)
+ assert_equal "Active until the user logs in.", block_status(block)
+
+ block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 1.hour)
+ assert_match %r{^Ends in and after the user has logged in\.$}, block_status(block)
+
+ block = create(:user_block, :ends_at => Time.now.utc + 1.hour)
+ assert_match %r{^Ends in \.$}, block_status(block)
end
- def test_block_status
- block = UserBlock.create(
- :user_id => 1,
- :creator_id => 2,
- :reason => "testing",
- :needs_view => true,
- :ends_at => Time.now.getutc
- )
- assert_equal I18n.t("user_block.helper.until_login"), block_status(block)
- block_end = Time.now.getutc + 60.minutes
- block = UserBlock.create(
- :user_id => 1,
- :creator_id => 2,
- :reason => "testing",
- :needs_view => true,
- :ends_at => Time.now.getutc + 60.minutes
- )
- assert_equal I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block_end)), block_status(block)
- block_end = Time.now.getutc + 60.minutes
- block = UserBlock.create(
- :user_id => 1,
- :creator_id => 2,
- :reason => "testing",
- :needs_view => false,
- :ends_at => Time.now.getutc + 60.minutes
- )
- assert_equal I18n.t("user_block.helper.time_future", :time => friendly_date(block_end)), block_status(block)
+ def test_block_duration_in_words
+ words = block_duration_in_words(364.days)
+ assert_equal "11 months", words
+
+ words = block_duration_in_words(24.hours)
+ assert_equal "1 day", words
+
+ # Ensure that nil hours is not passed to i18n.t
+ words = block_duration_in_words(10.minutes)
+ assert_equal "0 hours", words
+
+ words = block_duration_in_words(0)
+ assert_equal "0 hours", words
+
+ # Ensure that (slightly) negative durations don't mess everything up
+ # This can happen on zero hour blocks when ends_at is a millisecond before created_at
+ words = block_duration_in_words(-0.001)
+ assert_equal "0 hours", words
end
end