diff options
| -rw-r--r-- | app/mailers/request_mailer.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/link_to_helper_spec.rb | 12 |
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 |