aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/request_mailer.rb4
-rw-r--r--spec/controllers/request_controller_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 93b170aed..98e84d123 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: request_mailer.rb,v 1.53 2008-09-02 17:44:14 francis Exp $
+# $Id: request_mailer.rb,v 1.54 2008-09-04 05:19:07 francis Exp $
class RequestMailer < ApplicationMailer
@@ -168,7 +168,7 @@ class RequestMailer < ApplicationMailer
@from = contact_from_name_and_email
@recipients = info_request.user.name_and_email
@subject = "Some notes have been added to your FOI request - " + info_request.title
- @body = { :count => @count, :info_request => info_request, :url => main_url(comment_url(earliest_unalerted_comment)) }
+ @body = { :count => count, :info_request => info_request, :url => main_url(comment_url(earliest_unalerted_comment)) }
end
# Class function, called by script/mailin with all incoming responses.
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index fb80ef1ee..f60e8e88d 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -429,7 +429,7 @@ describe RequestController, "comment alerts" do
deliveries = ActionMailer::Base.deliveries
deliveries.size.should == 1
mail = deliveries[0]
- mail.body.should =~ /There are new annotations/
+ mail.body.should =~ /There are 2 new annotations/
mail.to_addrs.to_s.should == info_requests(:fancy_dog_request).user.name_and_email
mail.body =~ /(http:\/\/.*)/
mail_url = $1