X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b70da7b8ea15ab48bb2f34155567cea6dffc8fc9..72fcf73f2be4fbe51f9ed508d034c9cf3596caaa:/test/controllers/issues_controller_test.rb

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 5e980e0b8..167bcc7b6 100644
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -4,13 +4,11 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
   def test_index
     # Access issues list without login
     get issues_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => issues_path)
 
     # Access issues list as normal user
     session_for(create(:user))
     get issues_path
-    assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Access issues list as administrator
@@ -29,24 +27,22 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "moderator")
 
     # Access issue without login
-    get issue_path(:id => issue)
-    assert_response :redirect
+    get issue_path(issue)
     assert_redirected_to login_path(:referer => issue_path(issue))
 
     # Access issue as normal user
     session_for(create(:user))
-    get issue_path(:id => issue)
-    assert_response :redirect
+    get issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Access issue as administrator
     session_for(create(:administrator_user))
-    get issue_path(:id => issue)
+    get issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
 
     # Access issue as moderator
     session_for(create(:moderator_user))
-    get issue_path(:id => issue)
+    get issue_path(issue)
     assert_response :success
   end
 
@@ -55,24 +51,22 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "administrator")
 
     # Access issue without login
-    get issue_path(:id => issue)
-    assert_response :redirect
+    get issue_path(issue)
     assert_redirected_to login_path(:referer => issue_path(issue))
 
     # Access issue as normal user
     session_for(create(:user))
-    get issue_path(:id => issue)
-    assert_response :redirect
+    get issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Access issue as moderator
     session_for(create(:moderator_user))
-    get issue_path(:id => issue)
+    get issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
 
     # Access issue as administrator
     session_for(create(:administrator_user))
-    get issue_path(:id => issue)
+    get issue_path(issue)
     assert_response :success
   end
 
@@ -81,26 +75,25 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "moderator")
 
     # Resolve issue without login
-    post resolve_issue_path(:id => issue)
+    post resolve_issue_path(issue)
     assert_response :forbidden
 
     # Resolve issue as normal user
     session_for(create(:user))
-    post resolve_issue_path(:id => issue)
-    assert_response :redirect
+    post resolve_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Resolve issue as administrator
     session_for(create(:administrator_user))
-    post resolve_issue_path(:id => issue)
+    post resolve_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
-    assert_not issue.reload.resolved?
+    assert_not_predicate issue.reload, :resolved?
 
     # Resolve issue as moderator
     session_for(create(:moderator_user))
-    post resolve_issue_path(:id => issue)
+    post resolve_issue_path(issue)
     assert_response :redirect
-    assert issue.reload.resolved?
+    assert_predicate issue.reload, :resolved?
   end
 
   def test_resolve_administrator
@@ -108,26 +101,25 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "administrator")
 
     # Resolve issue without login
-    post resolve_issue_path(:id => issue)
+    post resolve_issue_path(issue)
     assert_response :forbidden
 
     # Resolve issue as normal user
     session_for(create(:user))
-    post resolve_issue_path(:id => issue)
-    assert_response :redirect
+    post resolve_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Resolve issue as moderator
     session_for(create(:moderator_user))
-    post resolve_issue_path(:id => issue)
+    post resolve_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
-    assert_not issue.reload.resolved?
+    assert_not_predicate issue.reload, :resolved?
 
     # Resolve issue as administrator
     session_for(create(:administrator_user))
-    post resolve_issue_path(:id => issue)
+    post resolve_issue_path(issue)
     assert_response :redirect
-    assert issue.reload.resolved?
+    assert_predicate issue.reload, :resolved?
   end
 
   def test_ignore_moderator
@@ -135,26 +127,25 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "moderator")
 
     # Ignore issue without login
-    post ignore_issue_path(:id => issue)
+    post ignore_issue_path(issue)
     assert_response :forbidden
 
     # Ignore issue as normal user
     session_for(create(:user))
-    post ignore_issue_path(:id => issue)
-    assert_response :redirect
+    post ignore_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Ignore issue as administrator
     session_for(create(:administrator_user))
-    post ignore_issue_path(:id => issue)
+    post ignore_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
-    assert_not issue.reload.ignored?
+    assert_not_predicate issue.reload, :ignored?
 
     # Ignore issue as moderator
     session_for(create(:moderator_user))
-    post ignore_issue_path(:id => issue)
+    post ignore_issue_path(issue)
     assert_response :redirect
-    assert issue.reload.ignored?
+    assert_predicate issue.reload, :ignored?
   end
 
   def test_ignore_administrator
@@ -162,26 +153,25 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue = create(:issue, :reportable => target_user, :reported_user => target_user, :assigned_role => "administrator")
 
     # Ignore issue without login
-    post ignore_issue_path(:id => issue)
+    post ignore_issue_path(issue)
     assert_response :forbidden
 
     # Ignore issue as normal user
     session_for(create(:user))
-    post ignore_issue_path(:id => issue)
-    assert_response :redirect
+    post ignore_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Ignore issue as moderator
     session_for(create(:moderator_user))
-    post ignore_issue_path(:id => issue)
+    post ignore_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
-    assert_not issue.reload.ignored?
+    assert_not_predicate issue.reload, :ignored?
 
     # Ignore issue as administrator
     session_for(create(:administrator_user))
-    post ignore_issue_path(:id => issue)
+    post ignore_issue_path(issue)
     assert_response :redirect
-    assert issue.reload.ignored?
+    assert_predicate issue.reload, :ignored?
   end
 
   def test_reopen_moderator
@@ -191,26 +181,25 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue.resolve!
 
     # Reopen issue without login
-    post reopen_issue_path(:id => issue)
+    post reopen_issue_path(issue)
     assert_response :forbidden
 
     # Reopen issue as normal user
     session_for(create(:user))
-    post reopen_issue_path(:id => issue)
-    assert_response :redirect
+    post reopen_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Reopen issue as administrator
     session_for(create(:administrator_user))
-    post reopen_issue_path(:id => issue)
+    post reopen_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
-    assert_not issue.reload.open?
+    assert_not_predicate issue.reload, :open?
 
     # Reopen issue as moderator
     session_for(create(:moderator_user))
-    post reopen_issue_path(:id => issue)
+    post reopen_issue_path(issue)
     assert_response :redirect
-    assert issue.reload.open?
+    assert_predicate issue.reload, :open?
   end
 
   def test_reopen_administrator
@@ -220,25 +209,24 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     issue.resolve!
 
     # Reopen issue without login
-    post reopen_issue_path(:id => issue)
+    post reopen_issue_path(issue)
     assert_response :forbidden
 
     # Reopen issue as normal user
     session_for(create(:user))
-    post reopen_issue_path(:id => issue)
-    assert_response :redirect
+    post reopen_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Reopen issue as moderator
     session_for(create(:moderator_user))
-    post reopen_issue_path(:id => issue)
+    post reopen_issue_path(issue)
     assert_redirected_to :controller => :errors, :action => :not_found
-    assert_not issue.reload.open?
+    assert_not_predicate issue.reload, :open?
 
     # Reopen issue as administrator
     session_for(create(:administrator_user))
-    post reopen_issue_path(:id => issue)
+    post reopen_issue_path(issue)
     assert_response :redirect
-    assert issue.reload.open?
+    assert_predicate issue.reload, :open?
   end
 end