Test that viewing a block marks it as seen

diff --git a/test/fixtures/user_blocks.yml b/test/fixtures/user_blocks.yml
index c29252916e6a42469a10680d5833539eda72e0db..4f631b3562a7509a7638813c7eff4835d59eb489 100644 (file)
--- a/test/fixtures/user_blocks.yml
+++ b/test/fixtures/user_blocks.yml
@@ -5,7 +5,7 @@ active_block:
   reason: "Active block"
   reason_format: "markdown"
   ends_at: "2012-05-01 11:22:33"
-  needs_view: false
+  needs_view: true
   revoker_id:
 
 expired_block:

diff --git a/test/functional/user_blocks_controller_test.rb b/test/functional/user_blocks_controller_test.rb
index 4029fca265f727b6a375d96424a7403c15eee2cc..e3b786795f65ddf9889a858651ef48017c0d327a 100644 (file)
--- a/test/functional/user_blocks_controller_test.rb
+++ b/test/functional/user_blocks_controller_test.rb
@@ -87,10 +87,6 @@ class UserBlocksControllerTest < ActionController::TestCase
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."
 
-    # Viewing an active block should work
-    get :show, :id => user_blocks(:active_block)
-    assert_response :success
-
     # Viewing an expired block should work
     get :show, :id => user_blocks(:expired_block)
     assert_response :success
@@ -98,6 +94,20 @@ class UserBlocksControllerTest < ActionController::TestCase
     # Viewing a revoked block should work
     get :show, :id => user_blocks(:revoked_block)
     assert_response :success
+
+    # Viewing an active block should work, but shouldn't mark it as seen
+    get :show, :id => user_blocks(:active_block)
+    assert_response :success
+    assert_equal true, UserBlock.find(user_blocks(:active_block).id).needs_view
+
+    # Login as the blocked user
+    session[:user] = users(:blocked_user).id
+    cookies["_osm_username"] = users(:blocked_user).display_name
+
+    # Now viewing it should mark it as seen
+    get :show, :id => user_blocks(:active_block)
+    assert_response :success
+    assert_equal false, UserBlock.find(user_blocks(:active_block).id).needs_view
   end
 
   ##