Update bundle

[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..73061ed57243af4913a5a73e903dc843001fc3ae 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "redactions_controller"
 
 class RedactionsControllerTest < ActionController::TestCase
 require "redactions_controller"
 
 class RedactionsControllerTest < ActionController::TestCase

-  api_fixtures
-

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -38,6 +36,8 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_index
   end
 
   def test_index

+    create(:redaction)
+

     get :index
     assert_response :success
     assert_template :index
     get :index
     assert_response :success
     assert_template :index


@@ -71,7 +71,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_moderator
     session[:user] = create(:moderator_user).id
 
   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
     assert_response :redirect
     assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   end


@@ -79,7 +79,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_moderator_invalid
     session[:user] = create(:moderator_user).id
 
   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
     assert_response :success
     assert_template :new
   end


@@ -87,7 +87,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_non_moderator
     session[:user] = create(:user).id
 
   def test_create_non_moderator
     session[:user] = create(:user).id
 

-    post :create, :redaction => { :title => "Foo", :description => "Description here." }
+    post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }

     assert_response :forbidden
   end
 
     assert_response :forbidden
   end
 


@@ -97,7 +97,7 @@ class RedactionsControllerTest < ActionController::TestCase
     # create an empty redaction
     redaction = create(:redaction)
 
     # 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
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end


@@ -109,7 +109,7 @@ class RedactionsControllerTest < ActionController::TestCase
     redaction = create(:redaction)
     create(:old_node, :redaction => redaction)
 
     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_response :redirect
     assert_redirected_to(redaction_path(redaction))
     assert_match /^Redaction is not empty/, flash[:error]


@@ -118,14 +118,14 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_delete_non_moderator
     session[:user] = create(:user).id
 
   def test_delete_non_moderator
     session[:user] = create(:user).id
 

-    delete :destroy, :id => create(:redaction).id
+    delete :destroy, :params => { :id => create(:redaction).id }

     assert_response :forbidden
   end
 
   def test_edit
     redaction = create(:redaction)
 
     assert_response :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
     assert_response :redirect
     assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end


@@ -133,14 +133,14 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_edit_moderator
     session[:user] = create(:moderator_user).id
 
   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
 
     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)
   end
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end


@@ -150,7 +150,7 @@ class RedactionsControllerTest < ActionController::TestCase
 
     redaction = create(:redaction)
 
 
     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
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
   end


@@ -160,7 +160,7 @@ class RedactionsControllerTest < ActionController::TestCase
 
     redaction = create(:redaction)
 
 
     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
     assert_response :success
     assert_template :edit
   end


@@ -170,7 +170,7 @@ class RedactionsControllerTest < ActionController::TestCase
 
     redaction = create(:redaction)
 
 
     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 :forbidden
   end
 end
     assert_response :forbidden
   end
 end