projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into fix/support-conversations-pagination
[akkoma]
/
test
/
web
/
ostatus
/
ostatus_controller_test.exs
diff --git
a/test/web/ostatus/ostatus_controller_test.exs
b/test/web/ostatus/ostatus_controller_test.exs
index 3b84358e4a66009f15bc8df5aecf1e7674790367..bb349cb1968216ed136d6f512cf21fd785f67abc 100644
(file)
--- a/
test/web/ostatus/ostatus_controller_test.exs
+++ b/
test/web/ostatus/ostatus_controller_test.exs
@@
-17,9
+17,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
:ok
end
:ok
end
- clear_config([:instance, :federating]) do
- Config.put([:instance, :federating], true)
- end
+ setup do: clear_config([:instance, :federating], true)
# Note: see ActivityPubControllerTest for JSON format tests
describe "GET /objects/:uuid (text/html)" do
# Note: see ActivityPubControllerTest for JSON format tests
describe "GET /objects/:uuid (text/html)" do
@@
-138,7
+136,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
user = insert(:user)
user = insert(:user)
- {:ok, like_activity
, _} = CommonAPI.favorite(note_activity.id, user
)
+ {:ok, like_activity
} = CommonAPI.favorite(user, note_activity.id
)
assert like_activity.data["type"] == "Like"
assert like_activity.data["type"] == "Like"