diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-13 09:16:48 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-13 09:16:48 -0700 |
| commit | d5045bf83cff620545b93c185e411216f814ffdd (patch) | |
| tree | 04f9a953cbfcdeba9c3d1affd6cd40dc6b61dd33 /spec/models/info_request_spec.rb | |
| parent | bf6fc976fb29adbc8d46336d3d010c99effcaef0 (diff) | |
| parent | 20ec9b49f3407223b7cbcb25a636ba44a4b6967c (diff) | |
Merge remote-tracking branch 'openaustralia_github/one_support_email_on_admin_attention_state' into develop
Conflicts:
Gemfile.lock
app/controllers/request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
spec/models/request_mailer_spec.rb
Diffstat (limited to 'spec/models/info_request_spec.rb')
| -rw-r--r-- | spec/models/info_request_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index 544852f91..728a538f9 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -426,8 +426,8 @@ describe InfoRequest do before do Time.stub!(:now).and_return(Time.utc(2007, 11, 9, 23, 59)) - @mock_comment_event = safe_mock_model(InfoRequestEvent, :created_at => Time.now - 23.days, :event_type => 'comment') - @mock_response_event = safe_mock_model(InfoRequestEvent, :created_at => Time.now - 22.days, :event_type => 'response') + @mock_comment_event = safe_mock_model(InfoRequestEvent, :created_at => Time.now - 23.days, :event_type => 'comment', :response? => false) + @mock_response_event = safe_mock_model(InfoRequestEvent, :created_at => Time.now - 22.days, :event_type => 'response', :response? => true) @info_request = InfoRequest.new(:prominence => 'normal', :awaiting_description => true, :info_request_events => [@mock_response_event, @mock_comment_event]) |