nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed the merge for the author convention

Browse source
This commit is contained in:
zhitomirskiyi 2011-03-10 20:13:52 -08:00
parent 9b00b2c786
commit 35cabd469f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/integration/receiving_spec.rb
View file

@ -91,7 +91,7 @@ describe 'a user receives a post' do
Notification.should_receive(:notify).with(@user1, anything(), @remote_person)
@sm = Factory.build(:status_message, :message => "hello @{#{@user1.name}; #{@user1.diaspora_handle}}", :diaspora_handle => @remote_person.diaspora_handle, :person => @remote_person)
@sm = Factory.build(:status_message, :message => "hello @{#{@user1.name}; #{@user1.diaspora_handle}}", :diaspora_handle => @remote_person.diaspora_handle, :author => @remote_person)
@sm.stub!(:socket_to_user)
@sm.save

2
spec/models/mention_spec.rb
View file

@ -16,7 +16,7 @@ describe Mention do
end
it 'notifies the person being mentioned' do
Notification.should_receive(:notify).with(@mentioned_user, anything(), @sm.person)
Notification.should_receive(:notify).with(@mentioned_user, anything(), @sm.author)
@sm.receive(@mentioned_user, @mentioned_user.person)
end