aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-03-15 15:09:24 +1100
committerHenare Degan <henare.degan@gmail.com>2013-03-15 15:09:24 +1100
commitb9fb43758d9a3f918fad78ff7d868e3f3c7e50a2 (patch)
treec1bbc2c8f576f046b858ec5d9648b8d2723f42fa
parent616611aa7f718fc7272b1bd1028def7e1a060ca9 (diff)
main_url was removed in 4c9f7f7f12a47b516137bf000c3f36120033a077
-rw-r--r--app/mailers/request_mailer.rb2
-rw-r--r--spec/helpers/link_to_helper_spec.rb12
2 files changed, 1 insertions, 13 deletions
diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb
index 3e0b05b65..3f5a24b5c 100644
--- a/app/mailers/request_mailer.rb
+++ b/app/mailers/request_mailer.rb
@@ -201,7 +201,7 @@ class RequestMailer < ApplicationMailer
end
def comment_on_alert_plural(info_request, count, earliest_unalerted_comment)
@count, @info_request = count, info_request
- @url = main_url(comment_url(earliest_unalerted_comment))
+ @url = comment_url(earliest_unalerted_comment)
headers('Return-Path' => blackhole_email, 'Reply-To' => contact_from_name_and_email, # not much we can do if the user's email is broken
'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834
diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb
index 5233f3f7f..3d494dcda 100644
--- a/spec/helpers/link_to_helper_spec.rb
+++ b/spec/helpers/link_to_helper_spec.rb
@@ -25,18 +25,6 @@ describe LinkToHelper do
end
- describe "when appending something to a URL" do
- it 'should append to things without query strings' do
- main_url('/a', '.json').should == 'http://test.host/a.json'
- end
- it 'should append to things with query strings' do
- main_url('/a?z=1', '.json').should == 'http://test.host/a.json?z=1'
- end
- it 'should fail silently with invalid URLs' do
- main_url('/a?z=9%', '.json').should == 'http://test.host/a?z=9%'
- end
- end
-
describe 'when displaying a user admin link for a request' do
it 'should return the text "An anonymous user (external)" in the case where there is no external username' do