X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11e97b3edb057f6f449209ca2afd169feda229a4..8538f0029b9d947149e4550831e4a8f2f31242c7:/test/controllers/issues_controller_test.rb diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb index 5e980e0b8..a988fc909 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 @@ -30,13 +28,11 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Access issue without login get issue_path(:id => issue) - assert_response :redirect 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 assert_redirected_to :controller => :errors, :action => :forbidden # Access issue as administrator @@ -56,13 +52,11 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Access issue without login get issue_path(:id => issue) - assert_response :redirect 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 assert_redirected_to :controller => :errors, :action => :forbidden # Access issue as moderator @@ -87,7 +81,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Resolve issue as normal user session_for(create(:user)) post resolve_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Resolve issue as administrator @@ -100,7 +93,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest session_for(create(:moderator_user)) post resolve_issue_path(:id => issue) assert_response :redirect - assert issue.reload.resolved? + assert_predicate issue.reload, :resolved? end def test_resolve_administrator @@ -114,7 +107,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Resolve issue as normal user session_for(create(:user)) post resolve_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Resolve issue as moderator @@ -127,7 +119,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest session_for(create(:administrator_user)) post resolve_issue_path(:id => issue) assert_response :redirect - assert issue.reload.resolved? + assert_predicate issue.reload, :resolved? end def test_ignore_moderator @@ -141,7 +133,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Ignore issue as normal user session_for(create(:user)) post ignore_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Ignore issue as administrator @@ -154,7 +145,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest session_for(create(:moderator_user)) post ignore_issue_path(:id => issue) assert_response :redirect - assert issue.reload.ignored? + assert_predicate issue.reload, :ignored? end def test_ignore_administrator @@ -168,7 +159,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Ignore issue as normal user session_for(create(:user)) post ignore_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Ignore issue as moderator @@ -181,7 +171,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest session_for(create(:administrator_user)) post ignore_issue_path(:id => issue) assert_response :redirect - assert issue.reload.ignored? + assert_predicate issue.reload, :ignored? end def test_reopen_moderator @@ -197,7 +187,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Reopen issue as normal user session_for(create(:user)) post reopen_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Reopen issue as administrator @@ -210,7 +199,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest session_for(create(:moderator_user)) post reopen_issue_path(:id => issue) assert_response :redirect - assert issue.reload.open? + assert_predicate issue.reload, :open? end def test_reopen_administrator @@ -226,7 +215,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest # Reopen issue as normal user session_for(create(:user)) post reopen_issue_path(:id => issue) - assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Reopen issue as moderator @@ -239,6 +227,6 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest session_for(create(:administrator_user)) post reopen_issue_path(:id => issue) assert_response :redirect - assert issue.reload.open? + assert_predicate issue.reload, :open? end end