X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7441f15b4fd59735ae00a16b47cfcf7eb99260a6..7a1615bc55aee72dd03a5dd43c08b4f13f669f06:/test/controllers/issues_controller_test.rb

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 224f2f8cf..1dd423a7a 100644
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -11,7 +11,7 @@ class IssuesControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
     get :index
     assert_response :redirect
-    assert_redirected_to root_path
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Access issues list as administrator
     session[:user] = create(:administrator_user).id
@@ -24,9 +24,9 @@ class IssuesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  def test_show
+  def test_show_moderator
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "moderator")
 
     # Access issue without login
     get :show, :params => { :id => issue.id }
@@ -37,22 +37,48 @@ class IssuesControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
     get :show, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to root_path
+    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 :not_found
+
+    # Access issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :show, :params => { :id => issue.id }
     assert_response :success
+  end
+
+  def test_show_administrator
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "administrator")
+
+    # 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 moderator
     session[:user] = create(:moderator_user).id
     get :show, :params => { :id => issue.id }
+    assert_response :not_found
+
+    # Access issue as administrator
+    session[:user] = create(:administrator_user).id
+    get :show, :params => { :id => issue.id }
     assert_response :success
   end
 
-  def test_resolve
+  def test_resolve_moderator
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "moderator")
 
     # Resolve issue without login
     get :resolve, :params => { :id => issue.id }
@@ -63,26 +89,52 @@ class IssuesControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
     get :resolve, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to root_path
+    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 :not_found
+    assert_not issue.reload.resolved?
+
+    # Resolve issue as moderator
+    session[:user] = create(:moderator_user).id
+    get :resolve, :params => { :id => issue.id }
+    assert_response :redirect
+    assert issue.reload.resolved?
+  end
+
+  def test_resolve_administrator
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "administrator")
+
+    # Resolve issue without login
+    get :resolve, :params => { :id => issue.id }
     assert_response :redirect
-    assert_equal true, issue.reload.resolved?
+    assert_redirected_to login_path(:referer => resolve_issue_path(issue))
 
-    issue.reopen!
+    # 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 moderator
     session[:user] = create(:moderator_user).id
     get :resolve, :params => { :id => issue.id }
+    assert_response :not_found
+    assert_not issue.reload.resolved?
+
+    # 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?
+    assert issue.reload.resolved?
   end
 
-  def test_ignore
+  def test_ignore_moderator
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "moderator")
 
     # Ignore issue without login
     get :ignore, :params => { :id => issue.id }
@@ -93,26 +145,52 @@ class IssuesControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
     get :ignore, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to root_path
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Ignore issue as administrator
     session[:user] = create(:administrator_user).id
     get :ignore, :params => { :id => issue.id }
+    assert_response :not_found
+    assert_not issue.reload.ignored?
+
+    # 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?
+    assert issue.reload.ignored?
+  end
 
-    issue.reopen!
+  def test_ignore_administrator
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "administrator")
+
+    # Ignore issue without login
+    get :ignore, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => ignore_issue_path(issue))
+
+    # 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
 
     # Ignore issue as moderator
     session[:user] = create(:moderator_user).id
     get :ignore, :params => { :id => issue.id }
+    assert_response :not_found
+    assert_not issue.reload.ignored?
+
+    # 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?
+    assert issue.reload.ignored?
   end
 
-  def test_reopen
+  def test_reopen_moderator
     target_user = create(:user)
-    issue = create(:issue, :reportable => target_user, :reported_user => target_user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "moderator")
 
     issue.resolve!
 
@@ -125,20 +203,48 @@ class IssuesControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
     get :reopen, :params => { :id => issue.id }
     assert_response :redirect
-    assert_redirected_to root_path
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Reopen issue as administrator
     session[:user] = create(:administrator_user).id
     get :reopen, :params => { :id => issue.id }
+    assert_response :not_found
+    assert_not issue.reload.open?
+
+    # 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?
+    assert issue.reload.open?
+  end
+
+  def test_reopen_administrator
+    target_user = create(:user)
+    issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "administrator")
 
     issue.resolve!
 
+    # Reopen issue without login
+    get :reopen, :params => { :id => issue.id }
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => reopen_issue_path(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
+
     # Reopen issue as moderator
     session[:user] = create(:moderator_user).id
     get :reopen, :params => { :id => issue.id }
+    assert_response :not_found
+    assert_not issue.reload.open?
+
+    # 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?
+    assert issue.reload.open?
   end
 end