Fix options passed by allow_thirdparty_images

[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 c4afa6c83b6e7e991d8ad8b869903af75d7932f9..99f59af4795437b488e576fdecca530de7cbc4cb 100644 (file)
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -4,14 +4,30 @@ class UserBlocksHelperTest < ActionView::TestCase
   include ApplicationHelper
 
   def test_block_status
-    block = create(:user_block, :needs_view, :ends_at => Time.now.getutc)
+    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.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, :needs_view, :ends_at => Time.now.utc + 1.hour)
+    assert_match %r{^Ends in <time title=".*" datetime=".*">about 1 hour</time> 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)
+    block = create(:user_block, :ends_at => Time.now.utc + 1.hour)
+    assert_match %r{^Ends in <time title=".* datetime=".*">about 1 hour</time>\.$}, block_status(block)
+  end
+
+  def test_block_short_status
+    freeze_time do
+      future_end_block = create(:user_block, :ends_at => Time.now.utc + 48.hours)
+      unread_future_end_block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 48.hours)
+      past_end_block = create(:user_block, :ends_at => Time.now.utc + 1.hour)
+      unread_past_end_block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 1.hour)
+
+      travel 24.hours
+
+      assert_equal "active", block_short_status(future_end_block)
+      assert_equal "active", block_short_status(unread_future_end_block)
+      assert_equal "ended", block_short_status(past_end_block)
+      assert_equal "active until read", block_short_status(unread_past_end_block)
+    end
   end
 
   def test_block_duration_in_words