diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
| commit | c8a203e221a55a5653596f5a8e092bd3877df9c4 (patch) | |
| tree | 3de4ac1214eca2c12a357e5f338b0d3055e79721 /spec/views | |
| parent | e6dc0f6606b26e13cb0cd16124fdb2aad3c1b5a6 (diff) | |
| parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) | |
Merge branch 'release/0.6.7'
Conflicts:
locale/cs/app.po
locale/ro_RO/app.po
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/public_body/show.rhtml_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/views/public_body/show.rhtml_spec.rb b/spec/views/public_body/show.rhtml_spec.rb index 1d21f80c4..a42516d72 100644 --- a/spec/views/public_body/show.rhtml_spec.rb +++ b/spec/views/public_body/show.rhtml_spec.rb @@ -12,6 +12,7 @@ describe "when viewing a body" do :info_requests => [1, 2, 3, 4], # out of sync with Xapian :publication_scheme => '', :calculated_home_page => '') + @pb.stub!(:override_request_email).and_return(nil) @pb.stub!(:is_requestable?).and_return(true) @pb.stub!(:has_notes?).and_return(false) @pb.stub!(:has_tag?).and_return(false) |