projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chores/bump-copyright' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
conversation_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
index c67e584dd73632762cadcaf5eaf0cf610e3e9e73..29bc4fd1784c5979078153b72940e52426fecd38 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
@@
-1,9
+1,9
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
- use Pleroma.Web.ConnCase
+ use Pleroma.Web.ConnCase
, async: true
alias Pleroma.Conversation.Participation
alias Pleroma.User
alias Pleroma.Conversation.Participation
alias Pleroma.User
@@
-18,7
+18,7
@@
defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
user_two = insert(:user)
user_three = insert(:user)
user_two = insert(:user)
user_three = insert(:user)
- {:ok, user_two} = User.follow(user_two, user_one)
+ {:ok, user_two
, user_one
} = User.follow(user_two, user_one)
{:ok, %{user: user_one, user_two: user_two, user_three: user_three, conn: conn}}
end
{:ok, %{user: user_one, user_two: user_two, user_three: user_three, conn: conn}}
end