aboutsummaryrefslogtreecommitdiffstats
path: root/spec/mailers
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-08-28 09:37:58 +0100
committerLouise Crow <louise.crow@gmail.com>2013-09-16 14:03:23 +0100
commiteb16ca53ae1b1cfa5f23bb56d10e9eecc50b00e6 (patch)
tree0426571e494be9213947fae6600b9cf7740bb6ec /spec/mailers
parent939f08a5396b65778748417c26b54c214fe35883 (diff)
Exclude hidden responses when calculating old_unclassified
Make old_unclassified_params method consistent with last_public_response_event and associated methods.
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/request_mailer_spec.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/spec/mailers/request_mailer_spec.rb b/spec/mailers/request_mailer_spec.rb
index f30beae82..4e0765921 100644
--- a/spec/mailers/request_mailer_spec.rb
+++ b/spec/mailers/request_mailer_spec.rb
@@ -230,10 +230,12 @@ describe RequestMailer, "when sending reminders to requesters to classify a resp
it 'should ask for all requests that are awaiting description and whose latest response is older
than the number of days given and that are not the holding pen' do
expected_conditions = [ "awaiting_description = ?
- AND (SELECT created_at
- FROM info_request_events
- WHERE info_request_events.info_request_id = info_requests.id
- AND info_request_events.event_type = 'response'
+ AND (SELECT info_request_events.created_at
+ FROM info_request_events, incoming_messages
+ WHERE info_request_events.info_request_id = info_requests.id
+ AND info_request_events.event_type = 'response'
+ AND incoming_messages.id = info_request_events.incoming_message_id
+ AND incoming_messages.prominence = 'normal'
ORDER BY created_at desc LIMIT 1) < ?
AND url_title != 'holding_pen'
AND user_id IS NOT NULL".split(' ').join(' '),