diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-05-14 17:01:13 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-06-04 13:51:17 +0100 |
| commit | 1b4cf23dd5fb1f07004c28bd44e38a3dad3426b9 (patch) | |
| tree | 76ecbdb77ebe58a107d2bf10d192e576cf629a71 | |
| parent | 2967cc3dd7b19b3e74cea7a20b15f5234fc070ec (diff) | |
Simplify InfoRequestEvent#is_incoming_message?
Just check if there's an associated InfoRequest.
user system total real
old 0.010000 0.000000 0.010000 ( 0.012269)
new 0.000000 0.000000 0.000000 ( 0.000101)
| -rw-r--r-- | app/models/info_request_event.rb | 2 | ||||
| -rw-r--r-- | spec/models/info_request_event_spec.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 29c1ce965..4a47edbe3 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -327,7 +327,7 @@ class InfoRequestEvent < ActiveRecord::Base def is_incoming_message? - !self.incoming_message_selective_columns("incoming_messages.id").nil? + !incoming_message.nil? end def is_outgoing_message? diff --git a/spec/models/info_request_event_spec.rb b/spec/models/info_request_event_spec.rb index ff20ab059..17c6a5004 100644 --- a/spec/models/info_request_event_spec.rb +++ b/spec/models/info_request_event_spec.rb @@ -111,8 +111,7 @@ describe InfoRequestEvent do describe "should know" do it "that it's an incoming message" do - event = InfoRequestEvent.new - event.stub!(:incoming_message_selective_columns).and_return(1) + event = InfoRequestEvent.new(:incoming_message => mock_model(IncomingMessage)) event.is_incoming_message?.should be_true event.is_outgoing_message?.should be_false event.is_comment?.should be_false |