diff options
| -rw-r--r-- | app/controllers/general_controller.rb | 2 | ||||
| -rw-r--r-- | config/packages | 5 | ||||
| -rw-r--r-- | spec/views/request/show.rhtml_spec.rb | 22 |
3 files changed, 16 insertions, 13 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 5c4103616..efab26fad 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -7,7 +7,7 @@ # # $Id: general_controller.rb,v 1.57 2009-10-03 10:23:43 francis Exp $ -require 'xmlsimple' +require 'lib/xmlsimple' require 'open-uri' class GeneralController < ApplicationController diff --git a/config/packages b/config/packages index f0bed1763..1078e59c8 100644 --- a/config/packages +++ b/config/packages @@ -1,7 +1,7 @@ ruby1.8 libpgsql-ruby1.8 libopenssl-ruby1.8 -rake +rake (>= 0.8.4-1) irb wv poppler-utils @@ -23,3 +23,6 @@ wdg-html-validator #libapache2-mod-passenger mutt librack-ruby1.8 +librmagick-ruby1.8 +libxml-simple-ruby +libfcgi-ruby1.8 diff --git a/spec/views/request/show.rhtml_spec.rb b/spec/views/request/show.rhtml_spec.rb index b17521a4b..4110dc0c2 100644 --- a/spec/views/request/show.rhtml_spec.rb +++ b/spec/views/request/show.rhtml_spec.rb @@ -17,22 +17,22 @@ describe 'when viewing an information request' do :prominence => 'normal') end - def do_render + def request_page assigns[:info_request] = @mock_request assigns[:info_request_events] = [] assigns[:status] = @mock_request.calculate_status - template.stub!(:render) + template.stub!(:render_partial) render 'request/show' end it 'should show the sidebar' do - template.should_receive(:render).with(:partial => 'sidebar') - do_render + template.should_receive(:render_partial).with(:partial => 'sidebar', :locals => {}) + request_page end it 'should show the actions people can take' do - template.should_receive(:render).with(:partial => 'after_actions') - do_render + template.should_receive(:render_partial).with(:partial => 'after_actions', :locals => {}) + request_page end describe 'when a status update has been requested' do @@ -42,7 +42,7 @@ describe 'when viewing an information request' do end it 'should show the first form for describing the state of the request' do - do_render + request_page response.should have_tag("div.describe_state_form#describe_state_form_1") end @@ -55,12 +55,12 @@ describe 'when viewing an information request' do end it 'should show the first form for describing the state of the request' do - do_render + request_page response.should have_tag("div.describe_state_form#describe_state_form_1") end it 'should show the second form for describing the state of the request' do - do_render + request_page response.should have_tag("div.describe_state_form#describe_state_form_2") end @@ -86,7 +86,7 @@ describe 'when viewing an information request' do end it 'should show a link to follow up the last response with clarification' do - do_render + request_page expected_url = "http://test.host/request/#{@mock_request.id}/response/#{@mock_response.id}#followup" response.should have_tag("a[href=#{expected_url}]", :text => 'send a follow up message') end @@ -100,7 +100,7 @@ describe 'when viewing an information request' do end it 'should show a link to follow up the request without reference to a specific response' do - do_render + request_page expected_url = "http://test.host/request/#{@mock_request.id}/response#followup" response.should have_tag("a[href=#{expected_url}]", :text => 'send a follow up message') end |