diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
| commit | b394b67663916c865452cc784d8642f72a305be5 (patch) | |
| tree | 63c92172fe7813e6354da0ead628ed2192ef0ee2 /spec/models/info_request_spec.rb | |
| parent | 8d21293461ce4b564261686ab8d6460f5fe51259 (diff) | |
| parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) | |
Merge branch 'release/0.8' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/contact_mailer/from_admin_message.rhtml
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 4112a2baa..f9d061362 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]) |