diff options
| author | Robin Houston <robin@lenny.robin> | 2011-09-08 00:56:59 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-09-08 00:56:59 +0100 |
| commit | 6e0e5e5bed89ff2093e1cca3fa50310f678565fd (patch) | |
| tree | ae9a198a8134e90ab2a140d699ed6f3248f467cc /spec/controllers/admin_request_controller_spec.rb | |
| parent | e286a5a91e449ef01b5ce5f23654d1316bffaf53 (diff) | |
| parent | a9002cc8e749df6f5961acab8e3e61fd21987fc1 (diff) | |
Merge branch 'develop' of git@github.com:sebbacon/alaveteli into develop
Conflicts:
app/models/request_mailer.rb
Diffstat (limited to 'spec/controllers/admin_request_controller_spec.rb')
| -rw-r--r-- | spec/controllers/admin_request_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb index 423c2fb49..6f9af0525 100644 --- a/spec/controllers/admin_request_controller_spec.rb +++ b/spec/controllers/admin_request_controller_spec.rb @@ -71,7 +71,7 @@ describe AdminRequestController, "when administering the holding pen" do post :redeliver_incoming, :redeliver_incoming_message_id => new_im.id, :url_title => ir.url_title ir = InfoRequest.find_by_url_title(ir.url_title) ir.incoming_messages.length.should == 2 - response.should redirect_to('http://test.host/admin/request/show/101') + response.should redirect_to(:controller=>'admin_request', :action=>'show', :id=>101) InfoRequest.holding_pen_request.incoming_messages.length.should == 0 end |