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

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

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index 08f32d4d0cea97b1ee4f28eb2f6eaef347d478e7..1c2ee65b334bb6e193ee19f85ce4e4779f6f99b5 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
 require "test_helper"

-require "redactions_controller"

 
 class RedactionsControllerTest < ActionController::TestCase
   ##
 
 class RedactionsControllerTest < ActionController::TestCase
   ##


@@ -64,7 +63,8 @@ class RedactionsControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
 
     get :new
     session[:user] = create(:user).id
 
     get :new

-    assert_response :forbidden
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_create_moderator
   end
 
   def test_create_moderator


@@ -87,7 +87,8 @@ class RedactionsControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
 
     post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }
     session[:user] = create(:user).id
 
     post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }

-    assert_response :forbidden
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_destroy_moderator_empty
   end
 
   def test_destroy_moderator_empty


@@ -118,7 +119,8 @@ class RedactionsControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
 
     delete :destroy, :params => { :id => create(:redaction).id }
     session[:user] = create(:user).id
 
     delete :destroy, :params => { :id => create(:redaction).id }

-    assert_response :forbidden
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_edit
   end
 
   def test_edit


@@ -140,7 +142,8 @@ class RedactionsControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
 
     get :edit, :params => { :id => create(:redaction).id }
     session[:user] = create(:user).id
 
     get :edit, :params => { :id => create(:redaction).id }

-    assert_response :forbidden
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 
   def test_update_moderator
   end
 
   def test_update_moderator


@@ -169,6 +172,7 @@ class RedactionsControllerTest < ActionController::TestCase
     redaction = create(:redaction)
 
     put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }
     redaction = create(:redaction)
 
     put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }

-    assert_response :forbidden
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

   end
 end
   end
 end