Remove if_user and similar methods

[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 8b97e4117aa1b29fd7b17215b619f6e4b5f2cf69..16f83ec89a64930d2af1c225fea36e43f6f55dd9 100644 (file)
--- 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)
 
   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 <span title=".*">about 1 hour</span> 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 <span title=".*">about 1 hour</span>\.$}, block_status(block)

   end
 end
   end
 end