diff options
| -rw-r--r-- | app/controllers/api_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/translation.rake | 44 | ||||
| -rw-r--r-- | spec/mailers/application_mailer_spec.rb | 24 | ||||
| -rw-r--r-- | spec/mailers/request_mailer_spec.rb | 2 |
5 files changed, 37 insertions, 37 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 424f0444d..61b68a2db 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -168,7 +168,7 @@ class ApiController < ApplicationController mail.parts << attachment end else - mail = RequestMailer.create_external_response(request, body, sent_at, attachment_hashes) + mail = RequestMailer.external_response(request, body, sent_at, attachment_hashes) end request.receive(mail, mail.encoded, true) end diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index daf290675..7895e05d5 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -878,7 +878,7 @@ class RequestController < ApplicationController mail.parts << attachment end else - mail = RequestMailer.create_fake_response(@info_request, @user, body, file_name, file_content) + mail = RequestMailer.fake_response(@info_request, @user, body, file_name, file_content) end @info_request.receive(mail, mail.encoded, true) flash[:notice] = _("Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to ") + CGI.escapeHTML(@info_request.user.name) + "." diff --git a/lib/tasks/translation.rake b/lib/tasks/translation.rake index ff07fc6f6..aab327d5b 100644 --- a/lib/tasks/translation.rake +++ b/lib/tasks/translation.rake @@ -42,14 +42,14 @@ namespace :translation do output_file = File.open(File.join(ENV['DIR'], 'message_preview.txt'), 'w') # outgoing mailer - request_email = OutgoingMailer.create_initial_request(info_request, initial_request) + request_email = OutgoingMailer.initial_request(info_request, initial_request) write_email(request_email, 'Initial Request', output_file) - followup_email = OutgoingMailer.create_followup(info_request, follow_up, nil) + followup_email = OutgoingMailer.followup(info_request, follow_up, nil) write_email(followup_email, 'Follow up', output_file) # contact mailer - contact_email = ContactMailer.create_to_admin_message(info_request.user_name, + contact_email = ContactMailer.to_admin_message(info_request.user_name, info_request.user.email, 'A test message', 'Hello!', @@ -59,20 +59,20 @@ namespace :translation do write_email(contact_email, 'Contact email (to admin)', output_file) - user_contact_email = ContactMailer.create_user_message(info_request.user, + user_contact_email = ContactMailer.user_message(info_request.user, info_request.user, 'http://www.example.com/user', 'A test message', 'Hello!') write_email(user_contact_email, 'Contact email (user to user)', output_file) - admin_contact_email = ContactMailer.create_from_admin_message(info_request.user, + admin_contact_email = ContactMailer.from_admin_message(info_request.user, 'A test message', 'Hello!') write_email(admin_contact_email, 'Contact email (admin to user)', output_file) # request mailer - fake_response_email = RequestMailer.create_fake_response(info_request, + fake_response_email = RequestMailer.fake_response(info_request, info_request.user, "test body", "attachment.txt", @@ -89,54 +89,54 @@ namespace :translation do response_mail = MailHandler.mail_from_raw_email(content) response_mail.from = "authority@example.com" - stopped_responses_email = RequestMailer.create_stopped_responses(info_request, + stopped_responses_email = RequestMailer.stopped_responses(info_request, response_mail, content) write_email(stopped_responses_email, 'Bounce if someone sends email to a request that has had responses stopped', output_file) - requires_admin_email = RequestMailer.create_requires_admin(info_request) + requires_admin_email = RequestMailer.requires_admin(info_request) write_email(requires_admin_email, 'Drawing admin attention to a response', output_file) - new_response_email = RequestMailer.create_new_response(info_request, incoming_message) + new_response_email = RequestMailer.new_response(info_request, incoming_message) write_email(new_response_email, 'Telling the requester that a new response has arrived', output_file) - overdue_alert_email = RequestMailer.create_overdue_alert(info_request, info_request.user) + overdue_alert_email = RequestMailer.overdue_alert(info_request, info_request.user) write_email(overdue_alert_email, 'Telling the requester that the public body is late in replying', output_file) - very_overdue_alert_email = RequestMailer.create_very_overdue_alert(info_request, info_request.user) + very_overdue_alert_email = RequestMailer.very_overdue_alert(info_request, info_request.user) write_email(very_overdue_alert_email, 'Telling the requester that the public body is very late in replying', output_file) - response_reminder_alert_email = RequestMailer.create_new_response_reminder_alert(info_request, + response_reminder_alert_email = RequestMailer.new_response_reminder_alert(info_request, incoming_message) write_email(response_reminder_alert_email, 'Telling the requester that they need to say if the new response contains info or not', output_file) - old_unclassified_email = RequestMailer.create_old_unclassified_updated(info_request) + old_unclassified_email = RequestMailer.old_unclassified_updated(info_request) write_email(old_unclassified_email, 'Telling the requester that someone updated their old unclassified request', output_file) - not_clarified_alert_email = RequestMailer.create_not_clarified_alert(info_request, incoming_message) + not_clarified_alert_email = RequestMailer.not_clarified_alert(info_request, incoming_message) write_email(not_clarified_alert_email, 'Telling the requester that they need to clarify their request', output_file) - comment_on_alert_email = RequestMailer.create_comment_on_alert(info_request, comment) + comment_on_alert_email = RequestMailer.comment_on_alert(info_request, comment) write_email(comment_on_alert_email, 'Telling requester that somebody added an annotation to their request', output_file) - comment_on_alert_plural_email = RequestMailer.create_comment_on_alert_plural(info_request, 2, comment) + comment_on_alert_plural_email = RequestMailer.comment_on_alert_plural(info_request, 2, comment) write_email(comment_on_alert_plural_email, 'Telling requester that somebody added multiple annotations to their request', output_file) @@ -149,7 +149,7 @@ namespace :translation do nil, 100, 1) - event_digest_email = TrackMailer.create_event_digest(info_request.user, + event_digest_email = TrackMailer.event_digest(info_request.user, [[track_thing, xapian_object.results, xapian_object]]) @@ -162,25 +162,25 @@ namespace :translation do :email => _("Then you can sign in to {{site_name}}", :site_name => site_name), :email_subject => _("Confirm your account on {{site_name}}", :site_name => site_name) } - confirm_login_email = UserMailer.create_confirm_login(info_request.user, + confirm_login_email = UserMailer.confirm_login(info_request.user, reasons, 'http://www.example.com') write_email(confirm_login_email, 'Confirm a user login', output_file) - already_registered_email = UserMailer.create_already_registered(info_request.user, + already_registered_email = UserMailer.already_registered(info_request.user, reasons, 'http://www.example.com') write_email(already_registered_email, 'Tell a user they are already registered', output_file) new_email = 'new_email@example.com' - changeemail_confirm_email = UserMailer.create_changeemail_confirm(info_request.user, + changeemail_confirm_email = UserMailer.changeemail_confirm(info_request.user, new_email, 'http://www.example.com') write_email(changeemail_confirm_email, 'Confirm that the user wants to change their email', output_file) - changeemail_already_used = UserMailer.create_changeemail_already_used('old_email@example.com', + changeemail_already_used = UserMailer.changeemail_already_used('old_email@example.com', new_email) write_email(changeemail_already_used, 'Tell a user that the email they want to change to is already used', @@ -189,4 +189,4 @@ namespace :translation do output_file.close end -end
\ No newline at end of file +end diff --git a/spec/mailers/application_mailer_spec.rb b/spec/mailers/application_mailer_spec.rb index cc4609e5a..d8993f78f 100644 --- a/spec/mailers/application_mailer_spec.rb +++ b/spec/mailers/application_mailer_spec.rb @@ -58,32 +58,32 @@ describe ApplicationMailer do it 'should render a theme template in preference to a core template' do prepend_theme_views('theme_one') - @mail = ApplicationMailer.create_simple() + @mail = ApplicationMailer.simple @mail.body.should match('Theme simple') end it 'should render the template provided by the theme if no template is available in core' do prepend_theme_views('theme_one') - @mail = ApplicationMailer.create_theme_only() + @mail = ApplicationMailer.theme_only @mail.body.should match('Theme only') end it 'should render the template provided by core if there is no theme template' do prepend_theme_views('theme_one') - @mail = ApplicationMailer.create_core_only() + @mail = ApplicationMailer.core_only @mail.body.should match('Core only') end it 'should render an empty body if the template is in neither core nor theme' do prepend_theme_views('theme_one') - @mail = ApplicationMailer.create_neither() + @mail = ApplicationMailer.neither @mail.body.should be_empty end it 'should render a multipart email using a theme template' do prepend_theme_views('theme_one') create_multipart_method('multipart_theme_only') - @mail = ApplicationMailer.create_multipart_theme_only() + @mail = ApplicationMailer.multipart_theme_only @mail.parts.size.should == 2 message_part = @mail.parts[0].to_s message_part.should match("Theme multipart") @@ -92,7 +92,7 @@ describe ApplicationMailer do it 'should render a multipart email using a core template' do prepend_theme_views('theme_one') create_multipart_method('multipart_core_only') - @mail = ApplicationMailer.create_multipart_core_only() + @mail = ApplicationMailer.multipart_core_only @mail.parts.size.should == 2 message_part = @mail.parts[0].to_s message_part.should match("Core multipart") @@ -104,32 +104,32 @@ describe ApplicationMailer do it 'should render a core template in preference to a theme template' do append_theme_views('theme_one') - @mail = ApplicationMailer.create_simple() + @mail = ApplicationMailer.simple @mail.body.should match('Core simple') end it 'should render the template provided by the theme if no template is available in core' do append_theme_views('theme_one') - @mail = ApplicationMailer.create_theme_only() + @mail = ApplicationMailer.theme_only @mail.body.should match('Theme only') end it 'should render the template provided by core if there is no theme template' do append_theme_views('theme_one') - @mail = ApplicationMailer.create_core_only() + @mail = ApplicationMailer.core_only @mail.body.should match('Core only') end it 'should render an empty body if the template is in neither core nor theme' do append_theme_views('theme_one') - @mail = ApplicationMailer.create_neither() + @mail = ApplicationMailer.neither @mail.body.should be_empty end it 'should render a multipart email using a core template' do append_theme_views('theme_one') create_multipart_method('multipart_core_only') - @mail = ApplicationMailer.create_multipart_core_only() + @mail = ApplicationMailer.multipart_core_only @mail.parts.size.should == 2 message_part = @mail.parts[0].to_s message_part.should match("Core multipart") @@ -138,7 +138,7 @@ describe ApplicationMailer do it 'should render a multipart email using a theme template' do append_theme_views('theme_one') create_multipart_method('multipart_theme_only') - @mail = ApplicationMailer.create_multipart_theme_only() + @mail = ApplicationMailer.multipart_theme_only @mail.parts.size.should == 2 message_part = @mail.parts[0].to_s message_part.should match("Theme multipart") diff --git a/spec/mailers/request_mailer_spec.rb b/spec/mailers/request_mailer_spec.rb index 7b7a9b105..18b925b33 100644 --- a/spec/mailers/request_mailer_spec.rb +++ b/spec/mailers/request_mailer_spec.rb @@ -312,7 +312,7 @@ describe RequestMailer, 'when sending mail when someone has updated an old uncla :public_body => @public_body, :display_status => 'Refused.', :url_title => 'test_request') - @mail = RequestMailer.create_old_unclassified_updated(@info_request) + @mail = RequestMailer.old_unclassified_updated(@info_request) end it 'should have the subject "Someone has updated the status of your request"' do |