Merge pull request #3009 from gravitystorm/svg_icons

[rails.git] / 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 026ddc300e7b140dd6965b25778e66f3fe6df301..16f83ec89a64930d2af1c225fea36e43f6f55dd9 100644 (file)
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -1,43 +1,16 @@
-# coding: utf-8
 require "test_helper"
-include ApplicationHelper
 
 class UserBlocksHelperTest < ActionView::TestCase
+  include ApplicationHelper
 
-  def setup
-    I18n.locale = "en"
-  end
+  def test_block_status
+    block = create(:user_block, :needs_view, :ends_at => Time.now.getutc)
+    assert_equal "Active until the user logs in.", block_status(block)
 
-  def teardown
-    I18n.locale = "en"
-  end
+    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)
 
-  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)).html_safe, 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)).html_safe, 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