diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-07-02 13:09:06 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-07-02 13:09:06 +0100 |
| commit | de929cfe8c0f297c9945189f1456bba3908498a1 (patch) | |
| tree | b8ddd5f1875723bda896c66084bc438fe6b8c088 /spec/models/incoming_message_spec.rb | |
| parent | 84a27578e5e82739e3a6826c5d2d9890edd600a4 (diff) | |
| parent | a9f1d84e7810936f7917c8a367b4713ea77554c9 (diff) | |
Merge branch 'master' into wdtk
Diffstat (limited to 'spec/models/incoming_message_spec.rb')
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 6cfd2eb64..c6658905c 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -120,6 +120,7 @@ describe IncomingMessage, " folding quoted parts of emails" do @user.stub!(:name).and_return("Sir [ Bobble") @info_request = mock_model(InfoRequest) @info_request.stub!(:user).and_return(@user) + @info_request.stub!(:user_name).and_return(@user.name) @incoming_message = IncomingMessage.new() @incoming_message.info_request = @info_request |