Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJonne Haß <me@jhass.eu>2021-04-11 18:23:46 +0300
committerJonne Haß <me@jhass.eu>2021-04-11 18:23:46 +0300
commitf4dc6d0dc78029fc8363519d8a24f4c016c1dd91 (patch)
treedbccc907aa51e8a1450649af323dd63586496bc2 /spec
parent5f00b4a4e6efe0f86810eaf9da72c063e9627935 (diff)
parent394eafccc528aaa9d2aed9925f0e24525a12b71f (diff)
Merge branch 'next-minor' into develop
Diffstat (limited to 'spec')
-rw-r--r--spec/mailers/notifier_spec.rb2
-rw-r--r--spec/models/status_message_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb
index 1337d105b..542a75275 100644
--- a/spec/mailers/notifier_spec.rb
+++ b/spec/mailers/notifier_spec.rb
@@ -216,7 +216,7 @@ describe Notifier, type: :mailer do
end
it "can handle status_messages without text" do
- photo = FactoryBot.create(:photo, public: true)
+ photo = FactoryBot.create(:photo, public: true, author: alice.person)
status = FactoryBot.create(:status_message, author: alice.person, text: nil, photos: [photo], public: true)
like = status.likes.create!(author: bob.person)
mail = Notifier.send_notification("liked", alice.id, like.author.id, like.id)
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index f06393e70..cbbd36a32 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -306,7 +306,7 @@ describe StatusMessage, type: :model do
let(:post) { FactoryBot.create(:status_message, author: alice.person) }
it "receives attached photos" do
- photo = FactoryBot.create(:photo, status_message: post)
+ photo = FactoryBot.create(:photo, status_message: post, author: alice.person)
post.receive([bob.id])
@@ -321,7 +321,7 @@ describe StatusMessage, type: :model do
end
it "works with already received attached photos" do
- photo = FactoryBot.create(:photo, status_message: post)
+ photo = FactoryBot.create(:photo, status_message: post, author: alice.person)
photo.receive([bob.id])
post.receive([bob.id])