diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-06-04 14:53:38 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-06-04 14:53:38 +0100 |
| commit | 26dbf38319f22de55d6c8bfbf3376df0dbb297c2 (patch) | |
| tree | e691cb9ea88a2246ff8ded443d4b00bdced38a0a /spec | |
| parent | e5963622d92cb3c901ad9d5f2c4d7aed254a5687 (diff) | |
| parent | 0024aaef7547bb1657b51572f1c072e10db2d1e4 (diff) | |
Merge branch '2288-public-body-page-performance' into develop
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/info_request_event_spec.rb | 3 | ||||
| -rw-r--r-- | spec/views/public_body/show.html.erb_spec.rb | 1 |
2 files changed, 2 insertions, 2 deletions
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 diff --git a/spec/views/public_body/show.html.erb_spec.rb b/spec/views/public_body/show.html.erb_spec.rb index a4edcfc22..c20d8483c 100644 --- a/spec/views/public_body/show.html.erb_spec.rb +++ b/spec/views/public_body/show.html.erb_spec.rb @@ -18,6 +18,7 @@ describe "public_body/show" do @pb.stub!(:special_not_requestable_reason?).and_return(false) @pb.stub!(:has_notes?).and_return(false) @pb.stub!(:has_tag?).and_return(false) + @pb.stub!(:tag_string).and_return('') @xap = mock(ActsAsXapian::Search, :matches_estimated => 2) @xap.stub!(:results).and_return([ { :model => mock_event }, |