Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop

Conflicts:
    app/controllers/admin_request_controller.rb
    app/models/request_mailer.rb
    app/views/admin_general/index.rhtml
    app/views/admin_general/stats.rhtml
    app/views/admin_public_body/_one_list.rhtml
    app/views/admin_public_body/_tags.rhtml
    app/views/admin_public_body/show.rhtml
    app/views/admin_request/show.rhtml
    app/views/admin_user/show.rhtml
    app/views/layouts/admin.rhtml
    app/views/public_body/show.rhtml
    app/views/request/new.rhtml

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/views/request/show.rhtml_spec.rb b/spec/views/request/show.rhtml_spec.rb
index 4429e9e58..a22f29951 100644
--- a/spec/views/request/show.rhtml_spec.rb
+++ b/spec/views/request/show.rhtml_spec.rb
@@ -98,7 +98,7 @@ describe 'when viewing an information request' do
             
                 it 'should show a link to follow up the last response with clarification' do 
                     request_page
-                    expected_url = "http://test.host/request/#{@mock_request.id}/response/#{@mock_response.id}#followup"
+                    expected_url = "/request/#{@mock_request.id}/response/#{@mock_response.id}#followup"
                     response.should have_tag("a[href=#{expected_url}]", :text => 'send a follow up message')
                 end
             
@@ -118,7 +118,7 @@ describe 'when viewing an information request' do
             
                 it 'should show a link to follow up the request without reference to a specific response' do 
                     request_page
-                    expected_url = "http://test.host/request/#{@mock_request.id}/response#followup"
+                    expected_url = "/request/#{@mock_request.id}/response#followup"
                     response.should have_tag("a[href=#{expected_url}]", :text => 'send a follow up message')
                 end
             end