Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 6 insertions, 6 deletions

diff --git a/spec/controllers/admin_incoming_message_controller_spec.rb b/spec/controllers/admin_incoming_message_controller_spec.rb
index 21c744e5b..24a526ca4 100644
--- a/spec/controllers/admin_incoming_message_controller_spec.rb
+++ b/spec/controllers/admin_incoming_message_controller_spec.rb
@@ -17,19 +17,19 @@ describe AdminIncomingMessageController, "when administering incoming messages"
         it "destroys the raw email file" do
             raw_email = @im.raw_email.filepath
             assert_equal File.exists?(raw_email), true
-            post :destroy, :incoming_message_id => @im.id
+            post :destroy, :id => @im.id
             assert_equal File.exists?(raw_email), false
         end
 
         it 'asks the incoming message to fully destroy itself' do
             IncomingMessage.stub!(:find).and_return(@im)
             @im.should_receive(:fully_destroy)
-            post :destroy, :incoming_message_id => @im.id
+            post :destroy, :id => @im.id
         end
 
         it 'expires the file cache for the associated info_request' do
             @controller.should_receive(:expire_for_request).with(@im.info_request)
-            post :destroy, :incoming_message_id => @im.id
+            post :destroy, :id => @im.id
         end
 
     end
@@ -46,7 +46,7 @@ describe AdminIncomingMessageController, "when administering incoming messages"
             destination_info_request = info_requests(:naughty_chicken_request)
             incoming_message = incoming_messages(:useless_incoming_message)
             @controller.should_receive(:expire_for_request).with(current_info_request)
-            post :redeliver, :redeliver_incoming_message_id => incoming_message.id,
+            post :redeliver, :id => incoming_message.id,
                              :url_title => destination_info_request.url_title
         end
 
@@ -56,7 +56,7 @@ describe AdminIncomingMessageController, "when administering incoming messages"
                 current_info_request = info_requests(:fancy_dog_request)
                 destination_info_request = info_requests(:naughty_chicken_request)
                 incoming_message = incoming_messages(:useless_incoming_message)
-                post :redeliver, :redeliver_incoming_message_id => incoming_message.id,
+                post :redeliver, :id => incoming_message.id,
                                  :url_title => destination_info_request.url_title
             end
 
@@ -130,7 +130,7 @@ describe AdminIncomingMessageController, "when administering incoming messages"
 
             it 'should redirect to the admin info request view' do
                 make_request
-                response.should redirect_to admin_request_show_url(@incoming.info_request)
+                response.should redirect_to admin_request_url(@incoming.info_request)
             end
 
             it 'should show a message that the incoming message has been updated' do