summaryrefslogtreecommitdiff
path: root/test/web/ostatus
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2018-12-03 21:37:55 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2018-12-04 14:04:06 +0300
commit7ec64ac33f52d2f5072b56f2f8eb5e9ce498e00f (patch)
tree3c56b69363671f7586ba8d169a349f73578c7d04 /test/web/ostatus
parent80bfdb4e7d3e339a1e47330c0de0fe7af9c00ab1 (diff)
downloadpleroma-7ec64ac33f52d2f5072b56f2f8eb5e9ce498e00f.tar.gz
pleroma-7ec64ac33f52d2f5072b56f2f8eb5e9ce498e00f.zip
update test
Diffstat (limited to 'test/web/ostatus')
-rw-r--r--test/web/ostatus/activity_representer_test.exs6
-rw-r--r--test/web/ostatus/ostatus_controller_test.exs6
2 files changed, 12 insertions, 0 deletions
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index 8bf3bc775..a351510d8 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -7,6 +7,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
alias Pleroma.Web.OStatus
import Pleroma.Factory
+ import Tesla.Mock
+
+ setup do
+ mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ :ok
+ end
test "an external note activity" do
incoming = File.read!("test/fixtures/mastodon-note-cw.xml")
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index e81adde68..6327a524e 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -4,6 +4,12 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
alias Pleroma.{User, Repo}
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus.ActivityRepresenter
+ import Tesla.Mock
+
+ setup do
+ mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ :ok
+ end
test "decodes a salmon", %{conn: conn} do
user = insert(:user)