From fb318373c747e382c76b49436ac82db3ae7fedd7 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 17 Aug 2016 00:25:50 +0200 Subject: [PATCH] only create mentions after creating statusmessages --- app/models/status_message.rb | 1 - spec/models/status_message_spec.rb | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/status_message.rb b/app/models/status_message.rb index 56279d8f8..de858152f 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -58,7 +58,6 @@ class StatusMessage < Post def mentioned_people if self.persisted? - create_mentions if self.mentions.empty? self.mentions.includes(:person => :profile).map{ |mention| mention.person } else Diaspora::Mentionable.people_from_string(text) diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb index f60f2f332..31901380b 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_spec.rb @@ -160,15 +160,16 @@ describe StatusMessage, type: :model do end describe "#mentioned_people" do - it "calls create_mentions if there are no mentions in the db" do + it "does not call create_mentions if there are no mentions in the db" do status_message.mentions.delete_all - expect(status_message).to receive(:create_mentions) + expect(status_message).not_to receive(:create_mentions) status_message.mentioned_people end + it "returns the mentioned people" do - status_message.mentions.delete_all expect(status_message.mentioned_people.to_set).to eq(people.to_set) end + it "does not call create_mentions if there are mentions in the db" do expect(status_message).not_to receive(:create_mentions) status_message.mentioned_people