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

[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 5ca72fe478263bde3b0234638990f1fc13ad8d92..b3bc4cf16f92900218605d4276b5141d18b76e8f 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -102,7 +102,7 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     # create an empty redaction
     redaction = create(:redaction)
 
     # create an empty redaction
     redaction = create(:redaction)
 

-    delete redaction_path(:id => redaction)
+    delete redaction_path(redaction)

     assert_redirected_to(redactions_path)
   end
 
     assert_redirected_to(redactions_path)
   end
 


@@ -113,7 +113,7 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
     redaction = create(:redaction)
     create(:old_node, :redaction => redaction)
 
     redaction = create(:redaction)
     create(:old_node, :redaction => redaction)
 

-    delete redaction_path(:id => redaction)
+    delete redaction_path(redaction)

     assert_redirected_to(redaction_path(redaction))
     assert_match(/^Redaction is not empty/, flash[:error])
   end
     assert_redirected_to(redaction_path(redaction))
     assert_match(/^Redaction is not empty/, flash[:error])
   end


@@ -121,28 +121,28 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
   def test_delete_non_moderator
     session_for(create(:user))
 
   def test_delete_non_moderator
     session_for(create(:user))
 

-    delete redaction_path(:id => create(:redaction))
+    delete redaction_path(create(:redaction))

     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_edit
     redaction = create(:redaction)
 
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
   def test_edit
     redaction = create(:redaction)
 

-    get edit_redaction_path(:id => redaction)
+    get edit_redaction_path(redaction)

     assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
 
   def test_edit_moderator
     session_for(create(:moderator_user))
 
     assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
 
   def test_edit_moderator
     session_for(create(:moderator_user))
 

-    get edit_redaction_path(:id => create(:redaction))
+    get edit_redaction_path(create(:redaction))

     assert_response :success
   end
 
   def test_edit_non_moderator
     session_for(create(:user))
 
     assert_response :success
   end
 
   def test_edit_non_moderator
     session_for(create(:user))
 

-    get edit_redaction_path(:id => create(:redaction))
+    get edit_redaction_path(create(:redaction))

     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 


@@ -151,7 +151,7 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
 
     redaction = create(:redaction)
 
 
     redaction = create(:redaction)
 

-    put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." })
+    put redaction_path(redaction, :redaction => { :title => "Foo", :description => "Description here." })

     assert_redirected_to(redaction_path(redaction))
   end
 
     assert_redirected_to(redaction_path(redaction))
   end
 


@@ -160,7 +160,7 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
 
     redaction = create(:redaction)
 
 
     redaction = create(:redaction)
 

-    put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "" })
+    put redaction_path(redaction, :redaction => { :title => "Foo", :description => "" })

     assert_response :success
     assert_template :edit
   end
     assert_response :success
     assert_template :edit
   end


@@ -170,7 +170,7 @@ class RedactionsControllerTest < ActionDispatch::IntegrationTest
 
     redaction = create(:redaction)
 
 
     redaction = create(:redaction)
 

-    put redaction_path(:id => redaction, :redaction => { :title => "Foo", :description => "Description here." })
+    put redaction_path(redaction, :redaction => { :title => "Foo", :description => "Description here." })

     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 end
     assert_redirected_to :controller => "errors", :action => "forbidden"
   end
 end