X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1766c3216f335721ce4259f4049c14439c1777dc..1b1d90a0f951a4aa26a6cb6f912a35efd5762962:/test/controllers/issues_controller_test.rb

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index a77ef8660..af0a86028 100644
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -1,91 +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
     assert_response :success
 
-    # Access issues_path by moderator
+    # Access issues list as moderator
     session[:user] = create(:moderator_user).id
     get :index
     assert_response :success
   end
 
-  def test_change_status_by_normal_user
+  def test_show
     target_user = create(:user)
     issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
-    # Login as normal user
+    # Access issue without login
+    get :show, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => issue_path(issue))
+
+    # 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
+
+    # Access issue as administrator
+    session[:user] = create(:administrator_user).id
+    get :show, :params => { :id => issue.id }
+    assert_response :success
 
-    assert_equal Issue.count, 1
+    # Access issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :show, :params => { :id => issue.id }
+    assert_response :success
+  end
+
+  def test_resolve
+    target_user = create(:user)
+    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 login_path(:referer => resolve_issue_path(issue))
 
+    # 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
+
+    # Resolve issue as administrator
+    session[:user] = create(:administrator_user).id
+    get :resolve, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to root_path
+    assert_equal true, issue.reload.resolved?
+
+    issue.reopen!
+
+    # Resolve issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :resolve, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_equal true, issue.reload.resolved?
   end
 
-  def test_change_status_by_admin
+  def test_ignore
     target_user = create(:user)
     issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
-    # Login as administrator
-    session[:user] = create(:administrator_user).id
+    # Ignore issue without login
+    get :ignore, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => ignore_issue_path(issue))
 
-    # Test 'Resolved'
-    get :resolve, :params => { :id => issue.id }
-    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").resolved?, true
+    # Ignore issue as normal user
+    session[:user] = create(:user).id
+    get :ignore, :params => { :id => issue.id }
     assert_response :redirect
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
-    # Test 'Reopen'
-    get :reopen, :params => { :id => issue.id }
-    assert_equal Issue.find_by(:reportable_id => target_user.id, :reportable_type => "User").open?, true
+    # Ignore issue as administrator
+    session[:user] = create(:administrator_user).id
+    get :ignore, :params => { :id => issue.id }
     assert_response :redirect
+    assert_equal true, issue.reload.ignored?
+
+    issue.reopen!
 
-    # Test 'Ignored'
+    # Ignore issue as moderator
+    session[:user] = create(:moderator_user).id
     get :ignore, :params => { :id => issue.id }
-    assert_equal Issue.find_by(:reportable_id => target_user, :reportable_type => "User").ignored?, true
     assert_response :redirect
+    assert_equal true, issue.reload.ignored?
   end
 
-  def test_search_issues
-    good_user = create(:user)
-    bad_user = create(:user)
-    create(:issue, :reportable => bad_user, :reported_user => bad_user, :issue_type => "administrator")
-    # Login as administrator
-    session[:user] = create(:administrator_user).id
+  def test_reopen
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
 
-    # No issues against the user
-    get :index, :params => { :search_by_user => good_user.display_name }
+    issue.resolve!
+
+    # Reopen issue without login
+    get :reopen, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to issues_path
+    assert_redirected_to login_path(:referer => reopen_issue_path(issue))
 
-    # User doesn't exist
-    get :index, :params => { :search_by_user => "test1000" }
+    # Reopen issue as normal user
+    session[:user] = create(:user).id
+    get :reopen, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to issues_path
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
-    # Find Issue against bad_user
-    get :index, :params => { :search_by_user => bad_user.display_name }
-    assert_response :success
+    # 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!
+
+    # Reopen issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :reopen, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_equal true, issue.reload.open?
   end
 end