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 feature/compat/push-subscriptions
[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 e81adde685f78020efc1bacf5086c8f1f965dec0..411e89e943488bc8eb1cb3927f627e520b38b417 100644
(file)
--- a/
test/web/ostatus/ostatus_controller_test.exs
+++ b/
test/web/ostatus/ostatus_controller_test.exs
@@
-5,6
+5,11
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus.ActivityRepresenter
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus.ActivityRepresenter
+ setup_all do
+ Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ :ok
+ end
+
test "decodes a salmon", %{conn: conn} do
user = insert(:user)
salmon = File.read!("test/fixtures/salmon.xml")
test "decodes a salmon", %{conn: conn} do
user = insert(:user)
salmon = File.read!("test/fixtures/salmon.xml")