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

[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 d16f664554117818c96539ebdee7a02ba2c75c29..141c7b20d99678ebdc65e2d977a43cec2dabd96b 100644 (file)
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -42,7 +42,7 @@ class IssuesControllerTest < ActionController::TestCase
     # Access issue as administrator
     session[:user] = create(:administrator_user).id
     get :show, :params => { :id => issue.id }
-    assert_response :not_found
+    assert_redirected_to :controller => :errors, :action => :not_found
 
     # Access issue as moderator
     session[:user] = create(:moderator_user).id
@@ -68,7 +68,7 @@ class IssuesControllerTest < ActionController::TestCase
     # Access issue as moderator
     session[:user] = create(:moderator_user).id
     get :show, :params => { :id => issue.id }
-    assert_response :not_found
+    assert_redirected_to :controller => :errors, :action => :not_found
 
     # Access issue as administrator
     session[:user] = create(:administrator_user).id
@@ -94,14 +94,14 @@ class IssuesControllerTest < ActionController::TestCase
     # Resolve issue as administrator
     session[:user] = create(:administrator_user).id
     get :resolve, :params => { :id => issue.id }
-    assert_response :not_found
-    assert_equal false, issue.reload.resolved?
+    assert_redirected_to :controller => :errors, :action => :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_equal true, issue.reload.resolved?
+    assert issue.reload.resolved?
   end
 
   def test_resolve_administrator
@@ -122,14 +122,14 @@ class IssuesControllerTest < ActionController::TestCase
     # Resolve issue as moderator
     session[:user] = create(:moderator_user).id
     get :resolve, :params => { :id => issue.id }
-    assert_response :not_found
-    assert_equal false, issue.reload.resolved?
+    assert_redirected_to :controller => :errors, :action => :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_moderator
@@ -150,14 +150,14 @@ class IssuesControllerTest < ActionController::TestCase
     # Ignore issue as administrator
     session[:user] = create(:administrator_user).id
     get :ignore, :params => { :id => issue.id }
-    assert_response :not_found
-    assert_equal false, issue.reload.ignored?
+    assert_redirected_to :controller => :errors, :action => :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
 
   def test_ignore_administrator
@@ -178,14 +178,14 @@ class IssuesControllerTest < ActionController::TestCase
     # Ignore issue as moderator
     session[:user] = create(:moderator_user).id
     get :ignore, :params => { :id => issue.id }
-    assert_response :not_found
-    assert_equal false, issue.reload.ignored?
+    assert_redirected_to :controller => :errors, :action => :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_moderator
@@ -208,14 +208,14 @@ class IssuesControllerTest < ActionController::TestCase
     # Reopen issue as administrator
     session[:user] = create(:administrator_user).id
     get :reopen, :params => { :id => issue.id }
-    assert_response :not_found
-    assert_equal false, issue.reload.open?
+    assert_redirected_to :controller => :errors, :action => :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
@@ -238,13 +238,13 @@ class IssuesControllerTest < ActionController::TestCase
     # Reopen issue as moderator
     session[:user] = create(:moderator_user).id
     get :reopen, :params => { :id => issue.id }
-    assert_response :not_found
-    assert_equal false, issue.reload.open?
+    assert_redirected_to :controller => :errors, :action => :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