X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6f375ef4936ea6e92e84b1473940af7883fba4d6..35370684e503ef4c51a9b6798eef12d336ed1ee9:/test/controllers/issues_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 4a7b19119..af0a86028 100644
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -1,244 +1,144 @@
 require "test_helper"
 
 class IssuesControllerTest < ActionController::TestCase
-  teardown do
-    # cleanup any emails set off by the test
-    ActionMailer::Base.deliveries.clear
-  end
-
-  def test_view_dashboard_without_auth
-    # Access issues_path without login
+  def test_index
+    # Access issues list without login
     get :index
     assert_response :redirect
     assert_redirected_to login_path(:referer => issues_path)
 
-    # Access issues_path as normal user
+    # Access issues list as normal user
     session[:user] = create(:user).id
     get :index
     assert_response :redirect
-    assert_redirected_to root_path
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
-    # Access issues_path by admin
+    # Access issues list as administrator
     session[:user] = create(:administrator_user).id
     get :index
-    # this is redirected because there are no issues?!
-    assert_response :redirect
-    assert_redirected_to issues_path
+    assert_response :success
 
-    # Access issues_path by moderator
+    # Access issues list as moderator
     session[:user] = create(:moderator_user).id
     get :index
-    # this is redirected because there are no issues?!
-    assert_response :redirect
-    assert_redirected_to issues_path
-  end
-
-  def test_new_issue_without_login
-    # Test creation of a new issue and a new report without logging in
-    get :new, :params => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 1 }
-    assert_response :redirect
-    assert_redirected_to login_path(:referer => new_issue_path(:reportable_id => 1, :reportable_type => "User", :reported_user_id => 1))
-  end
-
-  def test_new_issue_after_login
-    # Test creation of a new issue and a new report
-    target_user = create(:user)
-
-    # Login
-    session[:user] = create(:user).id
-
-    assert_equal Issue.count, 0
-
-    # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
     assert_response :success
-    assert_difference "Issue.count", 1 do
-      details = "Details of a report"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_equal Issue.count, 1
-    assert_response :redirect
-    assert_redirected_to root_path
   end
 
-  def test_new_report_with_incomplete_details
-    # Test creation of a new issue and a new report
+  def test_show
     target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
-    # Login
-    session[:user] = create(:user).id
-
-    assert_equal Issue.count, 0
-
-    # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-    assert_response :success
-    assert_difference "Issue.count", 1 do
-      details = "Details of a report"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_equal Issue.count, 1
-    assert_response :redirect
-    assert_redirected_to root_path
-
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-    assert_response :success
-
-    # Report without report_type
-    assert_no_difference "Issue.count" do
-      details = "Details of another report under the same issue"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_response :redirect
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count, 1
-
-    # Report without details
-    assert_no_difference "Issue.count" do
-      post :create,
-           :params => {
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => 1, :reportable_type => "User", :reported_user_id => 2 }
-           }
-    end
-    assert_response :redirect
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count, 1
-  end
-
-  def test_new_report_with_complete_details
-    # Test creation of a new issue and a new report
-    target_user = create(:user)
+    # Access issue without login
+    get :show, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => issue_path(issue))
 
-    # Login
+    # Access issue as normal user
     session[:user] = create(:user).id
+    get :show, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
-    assert_equal Issue.count, 0
-
-    # Create an Issue and a report
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
+    # Access issue as administrator
+    session[:user] = create(:administrator_user).id
+    get :show, :params => { :id => issue.id }
     assert_response :success
-    assert_difference "Issue.count", 1 do
-      details = "Details of a report"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_equal Issue.count, 1
-    assert_response :redirect
-    assert_redirected_to root_path
-
-    # Create a report for an existing Issue
-    get :new, :params => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
+
+    # Access issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :show, :params => { :id => issue.id }
     assert_response :success
-    assert_no_difference "Issue.count" do
-      details = "Details of another report under the same issue"
-      post :create,
-           :params => {
-             :report => { :details => details },
-             :report_type => "[OFFENSIVE]",
-             :issue => { :reportable_id => target_user.id, :reportable_type => "User", :reported_user_id => target_user.id }
-           }
-    end
-    assert_response :redirect
-    report_count = Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").reports.count
-    assert_equal report_count, 2
   end
 
-  def test_change_status_by_normal_user
+  def test_resolve
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
-
-    # Login as normal user
-    session[:user] = create(:user).id
-
-    assert_equal Issue.count, 1
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
+    # Resolve issue without login
     get :resolve, :params => { :id => issue.id }
-
     assert_response :redirect
-    assert_redirected_to root_path
-  end
+    assert_redirected_to login_path(:referer => resolve_issue_path(issue))
 
-  def test_change_status_by_admin
-    target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user_id => target_user.id)
+    # Resolve issue as normal user
+    session[:user] = create(:user).id
+    get :resolve, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
-    # Login as administrator
+    # Resolve issue as administrator
     session[:user] = create(:administrator_user).id
+    get :resolve, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_equal true, issue.reload.resolved?
+
+    issue.reopen!
 
-    # Test 'Resolved'
+    # Resolve issue as moderator
+    session[:user] = create(:moderator_user).id
     get :resolve, :params => { :id => issue.id }
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").resolved?, true
     assert_response :redirect
+    assert_equal true, issue.reload.resolved?
+  end
 
-    # Test 'Reopen'
-    get :reopen, :params => { :id => issue.id }
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user.id, "User").open?, true
+  def test_ignore
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
+
+    # Ignore issue without login
+    get :ignore, :params => { :id => issue.id }
     assert_response :redirect
+    assert_redirected_to login_path(:referer => ignore_issue_path(issue))
 
-    # Test 'Ignored'
+    # Ignore issue as normal user
+    session[:user] = create(:user).id
     get :ignore, :params => { :id => issue.id }
-    assert_equal Issue.find_by_reportable_id_and_reportable_type(target_user, "User").ignored?, true
     assert_response :redirect
-  end
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
-  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")
-    # Login as administrator
+    # Ignore issue as administrator
     session[:user] = create(:administrator_user).id
-
-    # No issues against the user
-    get :index, :params => { :search_by_user => good_user.display_name }
+    get :ignore, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to issues_path
+    assert_equal true, issue.reload.ignored?
 
-    # User doesn't exist
-    get :index, :params => { :search_by_user => "test1000" }
-    assert_response :redirect
-    assert_redirected_to issues_path
+    issue.reopen!
 
-    # Find Issue against bad_user
-    get :index, :params => { :search_by_user => bad_user.display_name }
-    assert_response :success
+    # Ignore issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :ignore, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_equal true, issue.reload.ignored?
   end
 
-  def test_comment_by_normal_user
-    issue = create(:issue)
+  def test_reopen
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
-    # Login as normal user
-    session[:user] = create(:user).id
+    issue.resolve!
 
-    get :comment, :params => { :id => issue.id }
+    # Reopen issue without login
+    get :reopen, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to root_path
-  end
+    assert_redirected_to login_path(:referer => reopen_issue_path(issue))
 
-  def test_comment
-    issue = create(:issue)
+    # Reopen issue as normal user
+    session[:user] = create(:user).id
+    get :reopen, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
-    # Login as administrator
+    # Reopen issue as administrator
     session[:user] = create(:administrator_user).id
+    get :reopen, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_equal true, issue.reload.open?
+
+    issue.resolve!
 
-    get :comment, :params => { :id => issue.id, :issue_comment => { :body => "test comment" } }
+    # Reopen issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :reopen, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to issue
+    assert_equal true, issue.reload.open?
   end
 end