Use CanCanCan for redaction authorizations

[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 73061ed57243af4913a5a73e903dc843001fc3ae..08f32d4d0cea97b1ee4f28eb2f6eaef347d478e7 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -64,8 +64,7 @@ class RedactionsControllerTest < ActionController::TestCase
     session[:user] = create(:user).id
 
     get :new
     session[:user] = create(:user).id
 
     get :new

-    assert_response :redirect
-    assert_redirected_to redactions_path
+    assert_response :forbidden

   end
 
   def test_create_moderator
   end
 
   def test_create_moderator


@@ -112,7 +111,7 @@ class RedactionsControllerTest < ActionController::TestCase
     delete :destroy, :params => { :id => redaction.id }
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
     delete :destroy, :params => { :id => redaction.id }
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))

-    assert_match /^Redaction is not empty/, flash[:error]
+    assert_match(/^Redaction is not empty/, flash[:error])

   end
 
   def test_delete_non_moderator
   end
 
   def test_delete_non_moderator


@@ -141,8 +140,7 @@ 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 :redirect
-    assert_redirected_to(redactions_path)
+    assert_response :forbidden

   end
 
   def test_update_moderator
   end
 
   def test_update_moderator