Merge remote-tracking branch 'upstream/pull/5021'

[rails.git] / test / controllers / issues_controller_test.rb

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index 5e980e0b8a02e5962e0bca421129a83fac210b7a..0dfc01da045f3eccd75be132e69270386cb54103 100644 (file)
--- 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,20 +81,19 @@ 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
     session_for(create(:administrator_user))
     post resolve_issue_path(:id => 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)
     assert_response :redirect
-    assert issue.reload.resolved?
+    assert_predicate issue.reload, :resolved?
   end
 
   def test_resolve_administrator
@@ -114,20 +107,19 @@ 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
     session_for(create(:moderator_user))
     post resolve_issue_path(:id => 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)
     assert_response :redirect
-    assert issue.reload.resolved?
+    assert_predicate issue.reload, :resolved?
   end
 
   def test_ignore_moderator
@@ -141,20 +133,19 @@ 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
     session_for(create(:administrator_user))
     post ignore_issue_path(:id => 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)
     assert_response :redirect
-    assert issue.reload.ignored?
+    assert_predicate issue.reload, :ignored?
   end
 
   def test_ignore_administrator
@@ -168,20 +159,19 @@ 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
     session_for(create(:moderator_user))
     post ignore_issue_path(:id => 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)
     assert_response :redirect
-    assert issue.reload.ignored?
+    assert_predicate issue.reload, :ignored?
   end
 
   def test_reopen_moderator
@@ -197,20 +187,19 @@ 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
     session_for(create(:administrator_user))
     post reopen_issue_path(:id => 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)
     assert_response :redirect
-    assert issue.reload.open?
+    assert_predicate issue.reload, :open?
   end
 
   def test_reopen_administrator
@@ -226,19 +215,18 @@ 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
     session_for(create(:moderator_user))
     post reopen_issue_path(:id => 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)
     assert_response :redirect
-    assert issue.reload.open?
+    assert_predicate issue.reload, :open?
   end
 end