Move and amend the issue comment controller tests.

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

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 4a7b19119bea76979f0c2dac1b24f95dc5ee017d..c57ee53a3aeba4c6718a73e213b8810ec9473f25 100644 (file)
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -104,7 +104,7 @@ class IssuesControllerTest < ActionController::TestCase
            }
     end
     assert_response :redirect
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count, 1
+    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count, 1
 
     # Report without details
     assert_no_difference "Issue.count" do
@@ -115,7 +115,7 @@ class IssuesControllerTest < ActionController::TestCase
            }
     end
     assert_response :redirect
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count, 1
+    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count, 1
   end
 
   def test_new_report_with_complete_details
@@ -156,13 +156,13 @@ class IssuesControllerTest < ActionController::TestCase
            }
     end
     assert_response :redirect
-    report_count = Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count
+    report_count = Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").reports.count
     assert_equal report_count, 2
   end
 
   def test_change_status_by_normal_user
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
     # Login as normal user
     session[:user] = create(:user).id
@@ -177,31 +177,31 @@ class IssuesControllerTest < ActionController::TestCase
 
   def test_change_status_by_admin
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
     # Login as administrator
     session[:user] = create(:administrator_user).id
 
     # Test 'Resolved'
     get :resolve, :params => { :id => issue.id }
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").resolved?, true
+    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").resolved?, true
     assert_response :redirect
 
     # Test 'Reopen'
     get :reopen, :params => { :id => issue.id }
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").open?, true
+    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").open?, true
     assert_response :redirect
 
     # Test 'Ignored'
     get :ignore, :params => { :id => issue.id }
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user, "User").ignored?, true
+    assert_equal Issue.find_by(:reportable_id => target_user, :reportable_type => "User").ignored?, true
     assert_response :redirect
   end
 
   def test_search_issues
     good_user = create(:user)
     bad_user = create(:user)
-    create(:issue, :reportable => bad_user, :reported_user_id => bad_user.id, :issue_type => "administrator")
+    create(:issue, :reportable => bad_user, :reported_user => bad_user, :issue_type => "administrator")
     # Login as administrator
     session[:user] = create(:administrator_user).id
 
@@ -219,26 +219,4 @@ class IssuesControllerTest < ActionController::TestCase
     get :index, :params => { :search_by_user => bad_user.display_name }
     assert_response :success
   end
-
-  def test_comment_by_normal_user
-    issue = create(:issue)
-
-    # Login as normal user
-    session[:user] = create(:user).id
-
-    get :comment, :params => { :id => issue.id }
-    assert_response :redirect
-    assert_redirected_to root_path
-  end
-
-  def test_comment
-    issue = create(:issue)
-
-    # Login as administrator
-    session[:user] = create(:administrator_user).id
-
-    get :comment, :params => { :id => issue.id, :issue_comment => { :body => "test comment" } }
-    assert_response :redirect
-    assert_redirected_to issue
-  end
 end