X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1e9a3f8664a1715e59211d25dd7168b95b85fe72..c7a7d298133b9df8ca3f341bdee47e02cb54cc51:/test/helpers/user_blocks_helper_test.rb?ds=sidebyside

diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb
index de5ff1c6a..16f83ec89 100644
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -1,42 +1,16 @@
-# coding: utf-8
 require "test_helper"
 
 class UserBlocksHelperTest < ActionView::TestCase
   include ApplicationHelper
-  def setup
-    I18n.locale = "en"
-  end
-
-  def teardown
-    I18n.locale = "en"
-  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)
+    block = create(:user_block, :needs_view, :ends_at => Time.now.getutc)
+    assert_equal "Active until the user logs in.", block_status(block)
+
+    block = create(:user_block, :needs_view, :ends_at => Time.now.getutc + 1.hour)
+    assert_match %r{^Ends in <span title=".*">about 1 hour</span> and after the user has logged in\.$}, block_status(block)
+
+    block = create(:user_block, :ends_at => Time.now.getutc + 1.hour)
+    assert_match %r{^Ends in <span title=".*">about 1 hour</span>\.$}, block_status(block)
   end
 end