X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9c926c6c71e0f387fddb24b010a57923b79125ad..9186a6155c4a9bbfd60eddd50f3eb63db78fd07e:/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 8b97e4117..16f83ec89 100644 --- a/test/helpers/user_blocks_helper_test.rb +++ b/test/helpers/user_blocks_helper_test.rb @@ -5,14 +5,12 @@ class UserBlocksHelperTest < ActionView::TestCase def test_block_status block = create(:user_block, :needs_view, :ends_at => Time.now.getutc) - assert_equal I18n.t("user_block.helper.until_login"), block_status(block) + assert_equal "Active until the user logs in.", block_status(block) - block_end = Time.now.getutc + 60.minutes - block = create(:user_block, :needs_view, :ends_at => block_end) - assert_equal I18n.t("user_block.helper.time_future_and_until_login", :time => friendly_date(block_end)), block_status(block) + block = create(:user_block, :needs_view, :ends_at => Time.now.getutc + 1.hour) + assert_match %r{^Ends in about 1 hour and after the user has logged in\.$}, block_status(block) - block_end = Time.now.getutc + 60.minutes - block = create(:user_block, :ends_at => block_end) - assert_equal I18n.t("user_block.helper.time_future", :time => friendly_date(block_end)), block_status(block) + block = create(:user_block, :ends_at => Time.now.getutc + 1.hour) + assert_match %r{^Ends in about 1 hour\.$}, block_status(block) end end