Merge remote-tracking branch 'upstream/pull/3186'

[rails.git] / test / controllers / user_blocks_controller_test.rb

diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
index b7dcf755bdef215e2709803035e77153b564a398..3e2be801da33e903bf4db4d874ae67c3051ed43c 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 require "test_helper"
 

-class UserBlocksControllerTest < ActionController::TestCase
-  fixtures :users, :user_roles
-
+class UserBlocksControllerTest < ActionDispatch::IntegrationTest

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -65,7 +63,7 @@ class UserBlocksControllerTest < ActionController::TestCase
     expired_block = create(:user_block, :expired)
     revoked_block = create(:user_block, :revoked)
 
     expired_block = create(:user_block, :expired)
     revoked_block = create(:user_block, :revoked)
 

-    get :index
+    get user_blocks_path

     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 4
     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 4


@@ -75,6 +73,24 @@ class UserBlocksControllerTest < ActionController::TestCase
     end
   end
 
     end
   end
 

+  ##
+  # test the index action with multiple pages
+  def test_index_paged
+    create_list(:user_block, 50)
+
+    get user_blocks_path
+    assert_response :success
+    assert_select "table#block_list", :count => 1 do
+      assert_select "tr", :count => 21
+    end
+
+    get user_blocks_path(:page => 2)
+    assert_response :success
+    assert_select "table#block_list", :count => 1 do
+      assert_select "tr", :count => 21
+    end
+  end
+

   ##
   # test the show action
   def test_show
   ##
   # test the show action
   def test_show


@@ -82,59 +98,56 @@ class UserBlocksControllerTest < ActionController::TestCase
     expired_block = create(:user_block, :expired)
     revoked_block = create(:user_block, :revoked)
 
     expired_block = create(:user_block, :expired)
     revoked_block = create(:user_block, :revoked)
 

-    # Viewing a block should fail when no ID is given
-    assert_raise ActionController::UrlGenerationError do
-      get :show
-    end
-

     # Viewing a block should fail when a bogus ID is given
     # Viewing a block should fail when a bogus ID is given

-    get :show, :id => 99999
+    get user_block_path(:id => 99999)

     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."
 
     # Viewing an expired block should work
     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."
 
     # Viewing an expired block should work

-    get :show, :id => expired_block.id
+    get user_block_path(:id => expired_block)

     assert_response :success
 
     # Viewing a revoked block should work
     assert_response :success
 
     # Viewing a revoked block should work

-    get :show, :id => revoked_block.id
+    get user_block_path(:id => revoked_block)

     assert_response :success
 
     # Viewing an active block should work, but shouldn't mark it as seen
     assert_response :success
 
     # Viewing an active block should work, but shouldn't mark it as seen

-    get :show, :id => active_block.id
+    get user_block_path(:id => active_block)

     assert_response :success
     assert_response :success

-    assert_equal true, UserBlock.find(active_block.id).needs_view
+    assert UserBlock.find(active_block.id).needs_view

 
     # Login as the blocked user
 
     # Login as the blocked user

-    session[:user] = active_block.user.id
+    session_for(active_block.user)

 
     # Now viewing it should mark it as seen
 
     # Now viewing it should mark it as seen

-    get :show, :id => active_block.id
+    get user_block_path(:id => active_block)

     assert_response :success
     assert_response :success

-    assert_equal false, UserBlock.find(active_block.id).needs_view
+    assert_not UserBlock.find(active_block.id).needs_view

   end
 
   ##
   # test the new action
   def test_new
   end
 
   ##
   # test the new action
   def test_new

+    target_user = create(:user)
+

     # Check that the block creation page requires us to login
     # Check that the block creation page requires us to login

-    get :new, :display_name => users(:normal_user).display_name
-    assert_redirected_to login_path(:referer => new_user_block_path(:display_name => users(:normal_user).display_name))
+    get new_user_block_path(:display_name => target_user.display_name)
+    assert_redirected_to login_path(:referer => new_user_block_path(:display_name => target_user.display_name))

 
     # Login as a normal user
 
     # Login as a normal user

-    session[:user] = users(:public_user).id
+    session_for(create(:user))

 
     # Check that normal users can't load the block creation page
 
     # Check that normal users can't load the block creation page

-    get :new, :display_name => users(:normal_user).display_name
-    assert_redirected_to user_blocks_path
-    assert_equal "You need to be a moderator to perform that action.", flash[:error]
+    get new_user_block_path(:display_name => target_user.display_name)
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
 
     # Login as a moderator

-    session[:user] = users(:moderator_user).id
+    session_for(create(:moderator_user))

 
     # Check that the block creation page loads for moderators
 
     # Check that the block creation page loads for moderators

-    get :new, :display_name => users(:normal_user).display_name
+    get new_user_block_path(:display_name => target_user.display_name)

     assert_response :success
     assert_select "form#new_user_block", :count => 1 do
       assert_select "textarea#user_block_reason", :count => 1
     assert_response :success
     assert_select "form#new_user_block", :count => 1 do
       assert_select "textarea#user_block_reason", :count => 1


@@ -144,16 +157,10 @@ class UserBlocksControllerTest < ActionController::TestCase
       assert_select "input[type='submit'][value='Create block']", :count => 1
     end
 
       assert_select "input[type='submit'][value='Create block']", :count => 1
     end
 

-    # We should get an error if no user is specified
-    get :new
-    assert_response :not_found
-    assert_template "user/no_such_user"
-    assert_select "h1", "The user  does not exist"
-

     # We should get an error if the user doesn't exist
     # We should get an error if the user doesn't exist

-    get :new, :display_name => "non_existent_user"
+    get new_user_block_path(:display_name => "non_existent_user")

     assert_response :not_found
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
   end
 
     assert_select "h1", "The user non_existent_user does not exist"
   end
 


@@ -163,22 +170,22 @@ class UserBlocksControllerTest < ActionController::TestCase
     active_block = create(:user_block)
 
     # Check that the block edit page requires us to login
     active_block = create(:user_block)
 
     # Check that the block edit page requires us to login

-    get :edit, :id => active_block.id
-    assert_redirected_to login_path(:referer => edit_user_block_path(:id => active_block.id))
+    get edit_user_block_path(:id => active_block)
+    assert_redirected_to login_path(:referer => edit_user_block_path(active_block))

 
     # Login as a normal user
 
     # Login as a normal user

-    session[:user] = users(:public_user).id
+    session_for(create(:user))

 
     # Check that normal users can't load the block edit page
 
     # Check that normal users can't load the block edit page

-    get :edit, :id => active_block.id
-    assert_redirected_to user_blocks_path
-    assert_equal "You need to be a moderator to perform that action.", flash[:error]
+    get edit_user_block_path(:id => active_block)
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
 
     # Login as a moderator

-    session[:user] = users(:moderator_user).id
+    session_for(create(:moderator_user))

 
     # Check that the block edit page loads for moderators
 
     # Check that the block edit page loads for moderators

-    get :edit, :id => active_block.id
+    get edit_user_block_path(:id => active_block)

     assert_response :success
     assert_select "form#edit_user_block_#{active_block.id}", :count => 1 do
       assert_select "textarea#user_block_reason", :count => 1
     assert_response :success
     assert_select "form#edit_user_block_#{active_block.id}", :count => 1 do
       assert_select "textarea#user_block_reason", :count => 1


@@ -187,13 +194,8 @@ class UserBlocksControllerTest < ActionController::TestCase
       assert_select "input[type='submit'][value='Update block']", :count => 1
     end
 
       assert_select "input[type='submit'][value='Update block']", :count => 1
     end
 

-    # We should get an error if no user is specified
-    assert_raise ActionController::UrlGenerationError do
-      get :edit
-    end
-

     # We should get an error if the user doesn't exist
     # We should get an error if the user doesn't exist

-    get :edit, :id => 99999
+    get edit_user_block_path(:id => 99999)

     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."
     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."


@@ -202,123 +204,119 @@ class UserBlocksControllerTest < ActionController::TestCase
   ##
   # test the create action
   def test_create
   ##
   # test the create action
   def test_create

+    target_user = create(:user)
+    moderator_user = create(:moderator_user)
+

     # Not logged in yet, so creating a block should fail
     # Not logged in yet, so creating a block should fail

-    post :create
+    post user_blocks_path

     assert_response :forbidden
 
     # Login as a normal user
     assert_response :forbidden
 
     # Login as a normal user

-    session[:user] = users(:public_user).id
+    session_for(create(:user))

 
     # Check that normal users can't create blocks
 
     # Check that normal users can't create blocks

-    post :create
-    assert_response :forbidden
+    post user_blocks_path
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
 
     # Login as a moderator

-    session[:user] = users(:moderator_user).id
+    session_for(moderator_user)

 
     # A bogus block period should result in an error
     assert_no_difference "UserBlock.count" do
 
     # A bogus block period should result in an error
     assert_no_difference "UserBlock.count" do

-      post :create,
-           :display_name => users(:unblocked_user).display_name,
-           :user_block_period => "99"
+      post user_blocks_path(:display_name => target_user.display_name,
+                            :user_block_period => "99")

     end
     end

-    assert_redirected_to new_user_block_path(:display_name => users(:unblocked_user).display_name)
+    assert_redirected_to new_user_block_path(:display_name => target_user.display_name)

     assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
 
     # Check that creating a block works
     assert_difference "UserBlock.count", 1 do
     assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
 
     # Check that creating a block works
     assert_difference "UserBlock.count", 1 do

-      post :create,
-           :display_name => users(:unblocked_user).display_name,
-           :user_block_period => "12",
-           :user_block => { :needs_view => false, :reason => "Vandalism" }
+      post user_blocks_path(:display_name => target_user.display_name,
+                            :user_block_period => "12",
+                            :user_block => { :needs_view => false, :reason => "Vandalism" })

     end
     id = UserBlock.order(:id).ids.last
     assert_redirected_to user_block_path(:id => id)
     end
     id = UserBlock.order(:id).ids.last
     assert_redirected_to user_block_path(:id => id)

-    assert_equal "Created a block on user #{users(:unblocked_user).display_name}.", flash[:notice]
+    assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice]

     b = UserBlock.find(id)
     assert_in_delta Time.now, b.created_at, 1
     assert_in_delta Time.now, b.updated_at, 1
     assert_in_delta Time.now + 12.hours, b.ends_at, 1
     b = UserBlock.find(id)
     assert_in_delta Time.now, b.created_at, 1
     assert_in_delta Time.now, b.updated_at, 1
     assert_in_delta Time.now + 12.hours, b.ends_at, 1

-    assert_equal false, b.needs_view
+    assert_not b.needs_view

     assert_equal "Vandalism", b.reason
     assert_equal "markdown", b.reason_format
     assert_equal "Vandalism", b.reason
     assert_equal "markdown", b.reason_format

-    assert_equal users(:moderator_user).id, b.creator_id
+    assert_equal moderator_user.id, b.creator_id

 
     # We should get an error if no user is specified
 
     # We should get an error if no user is specified

-    post :create
+    post user_blocks_path

     assert_response :not_found
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user  does not exist"
 
     # We should get an error if the user doesn't exist
     assert_select "h1", "The user  does not exist"
 
     # We should get an error if the user doesn't exist

-    post :create, :display_name => "non_existent_user"
+    post user_blocks_path(:display_name => "non_existent_user")

     assert_response :not_found
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
   end
 
   ##
   # test the update action
   def test_update
     assert_select "h1", "The user non_existent_user does not exist"
   end
 
   ##
   # test the update action
   def test_update

-    active_block = create(:user_block, :creator => users(:moderator_user))
+    moderator_user = create(:moderator_user)
+    second_moderator_user = create(:moderator_user)
+    active_block = create(:user_block, :creator => moderator_user)

 
     # Not logged in yet, so updating a block should fail
 
     # Not logged in yet, so updating a block should fail

-    put :update, :id => active_block.id
+    put user_block_path(:id => active_block)

     assert_response :forbidden
 
     # Login as a normal user
     assert_response :forbidden
 
     # Login as a normal user

-    session[:user] = users(:public_user).id
+    session_for(create(:user))

 
     # Check that normal users can't update blocks
 
     # Check that normal users can't update blocks

-    put :update, :id => active_block.id
-    assert_response :forbidden
+    put user_block_path(:id => active_block)
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as the wrong moderator
 
     # Login as the wrong moderator

-    session[:user] = users(:second_moderator_user).id
+    session_for(second_moderator_user)

 
     # Check that only the person who created a block can update it
     assert_no_difference "UserBlock.count" do
 
     # Check that only the person who created a block can update it
     assert_no_difference "UserBlock.count" do

-      put :update,
-          :id => active_block.id,
-          :user_block_period => "12",
-          :user_block => { :needs_view => true, :reason => "Vandalism" }
+      put user_block_path(:id => active_block,
+                          :user_block_period => "12",
+                          :user_block => { :needs_view => true, :reason => "Vandalism" })

     end
     end

-    assert_redirected_to edit_user_block_path(:id => active_block.id)
+    assert_redirected_to edit_user_block_path(active_block)

     assert_equal "Only the moderator who created this block can edit it.", flash[:error]
 
     # Login as the correct moderator
     assert_equal "Only the moderator who created this block can edit it.", flash[:error]
 
     # Login as the correct moderator

-    session[:user] = users(:moderator_user).id
+    session_for(moderator_user)

 
     # A bogus block period should result in an error
     assert_no_difference "UserBlock.count" do
 
     # A bogus block period should result in an error
     assert_no_difference "UserBlock.count" do

-      put :update,
-          :id => active_block.id,
-          :user_block_period => "99"
+      put user_block_path(:id => active_block, :user_block_period => "99")

     end
     end

-    assert_redirected_to edit_user_block_path(:id => active_block.id)
+    assert_redirected_to edit_user_block_path(active_block)

     assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
 
     # Check that updating a block works
     assert_no_difference "UserBlock.count" do
     assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
 
     # Check that updating a block works
     assert_no_difference "UserBlock.count" do

-      put :update,
-          :id => active_block.id,
-          :user_block_period => "12",
-          :user_block => { :needs_view => true, :reason => "Vandalism" }
+      put user_block_path(:id => active_block,
+                          :user_block_period => "12",
+                          :user_block => { :needs_view => true, :reason => "Vandalism" })

     end
     end

-    assert_redirected_to user_block_path(:id => active_block.id)
+    assert_redirected_to user_block_path(active_block)

     assert_equal "Block updated.", flash[:notice]
     b = UserBlock.find(active_block.id)
     assert_in_delta Time.now, b.updated_at, 1
     assert_equal "Block updated.", flash[:notice]
     b = UserBlock.find(active_block.id)
     assert_in_delta Time.now, b.updated_at, 1

-    assert_equal true, b.needs_view
+    assert b.needs_view

     assert_equal "Vandalism", b.reason
 
     assert_equal "Vandalism", b.reason
 

-    # We should get an error if no block ID is specified
-    assert_raise ActionController::UrlGenerationError do
-      put :update
-    end
-

     # We should get an error if the block doesn't exist
     # We should get an error if the block doesn't exist

-    put :update, :id => 99999
+    put user_block_path(:id => 99999)

     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."
     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."


@@ -330,22 +328,22 @@ class UserBlocksControllerTest < ActionController::TestCase
     active_block = create(:user_block)
 
     # Check that the block revoke page requires us to login
     active_block = create(:user_block)
 
     # Check that the block revoke page requires us to login

-    get :revoke, :id => active_block.id
-    assert_redirected_to login_path(:referer => revoke_user_block_path(:id => active_block.id))
+    get revoke_user_block_path(:id => active_block)
+    assert_redirected_to login_path(:referer => revoke_user_block_path(:id => active_block))

 
     # Login as a normal user
 
     # Login as a normal user

-    session[:user] = users(:public_user).id
+    session_for(create(:user))

 
     # Check that normal users can't load the block revoke page
 
     # Check that normal users can't load the block revoke page

-    get :revoke, :id => active_block.id
-    assert_redirected_to user_blocks_path
-    assert_equal "You need to be a moderator to perform that action.", flash[:error]
+    get revoke_user_block_path(:id => active_block)
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
 
     # Login as a moderator

-    session[:user] = users(:moderator_user).id
+    session_for(create(:moderator_user))

 
     # Check that the block revoke page loads for moderators
 
     # Check that the block revoke page loads for moderators

-    get :revoke, :id => active_block.id
+    get revoke_user_block_path(:id => active_block)

     assert_response :success
     assert_template "revoke"
     assert_select "form", :count => 1 do
     assert_response :success
     assert_template "revoke"
     assert_select "form", :count => 1 do


@@ -353,19 +351,21 @@ class UserBlocksControllerTest < ActionController::TestCase
       assert_select "input[type='submit'][value='Revoke!']", :count => 1
     end
 
       assert_select "input[type='submit'][value='Revoke!']", :count => 1
     end
 

-    # Check that revoking a block works
-    post :revoke, :id => active_block.id, :confirm => true
-    assert_redirected_to user_block_path(:id => active_block.id)
+    # Check that revoking a block using GET should fail
+    get revoke_user_block_path(:id => active_block, :confirm => true)
+    assert_response :success
+    assert_template "revoke"

     b = UserBlock.find(active_block.id)
     b = UserBlock.find(active_block.id)

-    assert_in_delta Time.now, b.ends_at, 1
+    assert b.ends_at - Time.now > 100

 
 

-    # We should get an error if no block ID is specified
-    assert_raise ActionController::UrlGenerationError do
-      get :revoke
-    end
+    # Check that revoking a block works using POST
+    post revoke_user_block_path(:id => active_block, :confirm => true)
+    assert_redirected_to user_block_path(active_block)
+    b = UserBlock.find(active_block.id)
+    assert_in_delta Time.now, b.ends_at, 1

 
     # We should get an error if the block doesn't exist
 
     # We should get an error if the block doesn't exist

-    get :revoke, :id => 99999
+    get revoke_user_block_path(:id => 99999)

     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."
     assert_response :not_found
     assert_template "not_found"
     assert_select "p", "Sorry, the user block with ID 99999 could not be found."


@@ -374,29 +374,27 @@ class UserBlocksControllerTest < ActionController::TestCase
   ##
   # test the blocks_on action
   def test_blocks_on
   ##
   # test the blocks_on action
   def test_blocks_on

-    active_block = create(:user_block, :user => users(:blocked_user))
-    revoked_block = create(:user_block, :revoked, :user => users(:blocked_user))
-    expired_block = create(:user_block, :expired, :user => users(:unblocked_user))
-
-    # Asking for a list of blocks with no user name should fail
-    assert_raise ActionController::UrlGenerationError do
-      get :blocks_on
-    end
+    blocked_user = create(:user)
+    unblocked_user = create(:user)
+    normal_user = create(:user)
+    active_block = create(:user_block, :user => blocked_user)
+    revoked_block = create(:user_block, :revoked, :user => blocked_user)
+    expired_block = create(:user_block, :expired, :user => unblocked_user)

 
     # Asking for a list of blocks with a bogus user name should fail
 
     # Asking for a list of blocks with a bogus user name should fail

-    get :blocks_on, :display_name => "non_existent_user"
+    get user_blocks_on_path(:display_name => "non_existent_user")

     assert_response :not_found
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks for a user that has never been blocked
     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks for a user that has never been blocked

-    get :blocks_on, :display_name => users(:normal_user).display_name
+    get user_blocks_on_path(:display_name => normal_user.display_name)

     assert_response :success
     assert_select "table#block_list", false
     assert_response :success
     assert_select "table#block_list", false

-    assert_select "p", "#{users(:normal_user).display_name} has not been blocked yet."
+    assert_select "p", "#{normal_user.display_name} has not been blocked yet."

 
     # Check the list of blocks for a user that is currently blocked
 
     # Check the list of blocks for a user that is currently blocked

-    get :blocks_on, :display_name => users(:blocked_user).display_name
+    get user_blocks_on_path(:display_name => blocked_user.display_name)

     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 3
     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 3


@@ -405,7 +403,7 @@ class UserBlocksControllerTest < ActionController::TestCase
     end
 
     # Check the list of blocks for a user that has previously been blocked
     end
 
     # Check the list of blocks for a user that has previously been blocked

-    get :blocks_on, :display_name => users(:unblocked_user).display_name
+    get user_blocks_on_path(:display_name => unblocked_user.display_name)

     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 2
     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 2


@@ -414,25 +412,42 @@ class UserBlocksControllerTest < ActionController::TestCase
   end
 
   ##
   end
 
   ##

-  # test the blocks_by action
-  def test_blocks_by
-    active_block = create(:user_block, :creator => users(:moderator_user))
-    expired_block = create(:user_block, :expired, :creator => users(:second_moderator_user))
-    revoked_block = create(:user_block, :revoked, :creator => users(:second_moderator_user))
+  # test the blocks_on action with multiple pages
+  def test_blocks_on_paged
+    user = create(:user)
+    create_list(:user_block, 50, :user => user)

 
 

-    # Asking for a list of blocks with no user name should fail
-    assert_raise ActionController::UrlGenerationError do
-      get :blocks_by
+    get user_blocks_on_path(:display_name => user.display_name)
+    assert_response :success
+    assert_select "table#block_list", :count => 1 do
+      assert_select "tr", :count => 21

     end
 
     end
 

+    get user_blocks_on_path(:display_name => user.display_name, :page => 2)
+    assert_response :success
+    assert_select "table#block_list", :count => 1 do
+      assert_select "tr", :count => 21
+    end
+  end
+
+  ##
+  # test the blocks_by action
+  def test_blocks_by
+    moderator_user = create(:moderator_user)
+    second_moderator_user = create(:moderator_user)
+    normal_user = create(:user)
+    active_block = create(:user_block, :creator => moderator_user)
+    expired_block = create(:user_block, :expired, :creator => second_moderator_user)
+    revoked_block = create(:user_block, :revoked, :creator => second_moderator_user)
+

     # Asking for a list of blocks with a bogus user name should fail
     # Asking for a list of blocks with a bogus user name should fail

-    get :blocks_by, :display_name => "non_existent_user"
+    get user_blocks_by_path(:display_name => "non_existent_user")

     assert_response :not_found
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks given by one moderator
     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks given by one moderator

-    get :blocks_by, :display_name => users(:moderator_user).display_name
+    get user_blocks_by_path(:display_name => moderator_user.display_name)

     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 2
     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 2


@@ -440,7 +455,7 @@ class UserBlocksControllerTest < ActionController::TestCase
     end
 
     # Check the list of blocks given by a different moderator
     end
 
     # Check the list of blocks given by a different moderator

-    get :blocks_by, :display_name => users(:second_moderator_user).display_name
+    get user_blocks_by_path(:display_name => second_moderator_user.display_name)

     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 3
     assert_response :success
     assert_select "table#block_list", :count => 1 do
       assert_select "tr", 3


@@ -449,9 +464,28 @@ class UserBlocksControllerTest < ActionController::TestCase
     end
 
     # Check the list of blocks (not) given by a normal user
     end
 
     # Check the list of blocks (not) given by a normal user

-    get :blocks_by, :display_name => users(:normal_user).display_name
+    get user_blocks_by_path(:display_name => normal_user.display_name)

     assert_response :success
     assert_select "table#block_list", false
     assert_response :success
     assert_select "table#block_list", false

-    assert_select "p", "#{users(:normal_user).display_name} has not made any blocks yet."
+    assert_select "p", "#{normal_user.display_name} has not made any blocks yet."
+  end
+
+  ##
+  # test the blocks_by action with multiple pages
+  def test_blocks_by_paged
+    user = create(:moderator_user)
+    create_list(:user_block, 50, :creator => user)
+
+    get user_blocks_by_path(:display_name => user.display_name)
+    assert_response :success
+    assert_select "table#block_list", :count => 1 do
+      assert_select "tr", :count => 21
+    end
+
+    get user_blocks_by_path(:display_name => user.display_name, :page => 2)
+    assert_response :success
+    assert_select "table#block_list", :count => 1 do
+      assert_select "tr", :count => 21
+    end

   end
 end
   end
 end