diff options
| -rw-r--r-- | app/controllers/admin_incoming_message_controller.rb | 4 | ||||
| -rw-r--r-- | config/routes.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/admin_incoming_message_controller_spec.rb | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/controllers/admin_incoming_message_controller.rb b/app/controllers/admin_incoming_message_controller.rb index a6d5fc542..72c9a84fa 100644 --- a/app/controllers/admin_incoming_message_controller.rb +++ b/app/controllers/admin_incoming_message_controller.rb @@ -1,6 +1,6 @@ class AdminIncomingMessageController < AdminController - def destroy_incoming + def destroy @incoming_message = IncomingMessage.find(params[:incoming_message_id]) @info_request = @incoming_message.info_request incoming_message_id = @incoming_message.id @@ -14,7 +14,7 @@ class AdminIncomingMessageController < AdminController redirect_to admin_request_show_url(@info_request) end - def redeliver_incoming + def redeliver incoming_message = IncomingMessage.find(params[:redeliver_incoming_message_id]) message_ids = params[:url_title].split(",").each {|x| x.strip} previous_request = incoming_message.info_request diff --git a/config/routes.rb b/config/routes.rb index 9bba3d854..40b620cee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -198,8 +198,8 @@ Alaveteli::Application.routes.draw do #### #### AdminIncomingMessage controller - match '/admin/request/destroy_incoming' => 'admin_incoming_message#destroy_incoming', :as => :admin_request_destroy_incoming - match '/admin/request/redeliver_incoming' => 'admin_incoming_message#redeliver_incoming', :as => :admin_request_redeliver_incoming + match '/admin/request/destroy_incoming' => 'admin_incoming_message#destroy', :as => :admin_request_destroy_incoming + match '/admin/request/redeliver_incoming' => 'admin_incoming_message#redeliver', :as => :admin_request_redeliver_incoming #### #### AdminOutgoingMessage controller diff --git a/spec/controllers/admin_incoming_message_controller_spec.rb b/spec/controllers/admin_incoming_message_controller_spec.rb index 7439197ef..1ee78cd35 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, :incoming_message_id => @im.id + post :destroy, :incoming_message_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, :incoming_message_id => @im.id + post :destroy, :incoming_message_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, :incoming_message_id => @im.id + post :destroy, :incoming_message_id => @im.id end end @@ -41,8 +41,8 @@ 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_incoming, :redeliver_incoming_message_id => incoming_message.id, - :url_title => destination_info_request.url_title + post :redeliver, :redeliver_incoming_message_id => incoming_message.id, + :url_title => destination_info_request.url_title end |