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 5a72830e4805c85ff39f03aefaad4e5be4ce2cfa..1c2ee65b334bb6e193ee19f85ce4e4779f6f99b5 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,9 +1,6 @@
 require "test_helper"
-require "redactions_controller"
 
 class RedactionsControllerTest < ActionController::TestCase
-  api_fixtures
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -38,6 +35,8 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_index
+    create(:redaction)
+
     get :index
     assert_response :success
     assert_template :index
@@ -65,13 +64,13 @@ class RedactionsControllerTest < ActionController::TestCase
 
     get :new
     assert_response :redirect
-    assert_redirected_to redactions_path
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_create_moderator
     session[:user] = create(:moderator_user).id
 
-    post :create, :redaction => { :title => "Foo", :description => "Description here." }
+    post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }
     assert_response :redirect
     assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   end
@@ -79,7 +78,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_moderator_invalid
     session[:user] = create(:moderator_user).id
 
-    post :create, :redaction => { :title => "Foo", :description => "" }
+    post :create, :params => { :redaction => { :title => "Foo", :description => "" } }
     assert_response :success
     assert_template :new
   end
@@ -87,8 +86,9 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_non_moderator
     session[:user] = create(:user).id
 
-    post :create, :redaction => { :title => "Foo", :description => "Description here." }
-    assert_response :forbidden
+    post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_destroy_moderator_empty
@@ -97,7 +97,7 @@ class RedactionsControllerTest < ActionController::TestCase
     # create an empty redaction
     redaction = create(:redaction)
 
-    delete :destroy, :id => redaction.id
+    delete :destroy, :params => { :id => redaction.id }
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end
@@ -109,23 +109,24 @@ class RedactionsControllerTest < ActionController::TestCase
     redaction = create(:redaction)
     create(:old_node, :redaction => redaction)
 
-    delete :destroy, :id => redaction.id
+    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
     session[:user] = create(:user).id
 
-    delete :destroy, :id => create(:redaction).id
-    assert_response :forbidden
+    delete :destroy, :params => { :id => create(:redaction).id }
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_edit
     redaction = create(:redaction)
 
-    get :edit, :id => redaction.id
+    get :edit, :params => { :id => redaction.id }
     assert_response :redirect
     assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
@@ -133,16 +134,16 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_edit_moderator
     session[:user] = create(:moderator_user).id
 
-    get :edit, :id => create(:redaction).id
+    get :edit, :params => { :id => create(:redaction).id }
     assert_response :success
   end
 
   def test_edit_non_moderator
     session[:user] = create(:user).id
 
-    get :edit, :id => create(:redaction).id
+    get :edit, :params => { :id => create(:redaction).id }
     assert_response :redirect
-    assert_redirected_to(redactions_path)
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_update_moderator
@@ -150,7 +151,7 @@ class RedactionsControllerTest < ActionController::TestCase
 
     redaction = create(:redaction)
 
-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
+    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
   end
@@ -160,7 +161,7 @@ class RedactionsControllerTest < ActionController::TestCase
 
     redaction = create(:redaction)
 
-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "" }
+    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "" } }
     assert_response :success
     assert_template :edit
   end
@@ -170,7 +171,8 @@ class RedactionsControllerTest < ActionController::TestCase
 
     redaction = create(:redaction)
 
-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
-    assert_response :forbidden
+    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 end