Simplify diary_comments_path calls in tests

diff --git a/test/controllers/diary_comments_controller_test.rb b/test/controllers/diary_comments_controller_test.rb
index 3ea9bc09400d5334d3a80044d68089736591b427..f6ba6af657e69b265be02d253ffc2b56c48f9f0a 100644 (file)
--- a/test/controllers/diary_comments_controller_test.rb
+++ b/test/controllers/diary_comments_controller_test.rb
@@ -36,7 +36,7 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     deleted_user = create(:user, :deleted)
 
     # Test a user with no comments
     deleted_user = create(:user, :deleted)
 
     # Test a user with no comments

-    get diary_comments_path(:display_name => user.display_name)
+    get diary_comments_path(user)

     assert_response :success
     assert_template :index
     assert_select "h4", :html => "No diary comments"
     assert_response :success
     assert_template :index
     assert_select "h4", :html => "No diary comments"


@@ -44,7 +44,7 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     # Test a user with a comment
     create(:diary_comment, :user => other_user)
 
     # Test a user with a comment
     create(:diary_comment, :user => other_user)
 

-    get diary_comments_path(:display_name => other_user.display_name)
+    get diary_comments_path(other_user)

     assert_response :success
     assert_template :index
     assert_dom "a[href='#{user_path(other_user)}']", :text => other_user.display_name
     assert_response :success
     assert_template :index
     assert_dom "a[href='#{user_path(other_user)}']", :text => other_user.display_name


@@ -53,11 +53,11 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     end
 
     # Test a suspended user
     end
 
     # Test a suspended user

-    get diary_comments_path(:display_name => suspended_user.display_name)
+    get diary_comments_path(suspended_user)

     assert_response :not_found
 
     # Test a deleted user
     assert_response :not_found
 
     # Test a deleted user

-    get diary_comments_path(:display_name => deleted_user.display_name)
+    get diary_comments_path(deleted_user)

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -65,10 +65,10 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
 
     %w[-1 0 fred].each do |id|
     user = create(:user)
 
     %w[-1 0 fred].each do |id|

-      get diary_comments_path(:display_name => user.display_name, :before => id)
+      get diary_comments_path(user, :before => id)

       assert_redirected_to :controller => :errors, :action => :bad_request
 
       assert_redirected_to :controller => :errors, :action => :bad_request
 

-      get diary_comments_path(:display_name => user.display_name, :after => id)
+      get diary_comments_path(user, :after => id)

       assert_redirected_to :controller => :errors, :action => :bad_request
     end
   end
       assert_redirected_to :controller => :errors, :action => :bad_request
     end
   end