summaryrefslogtreecommitdiff
path: root/test/web/salmon
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-04 18:41:00 +0000
committerkaniini <nenolod@gmail.com>2018-12-04 18:41:00 +0000
commit114b95cee20c9bb4922627e5397a70d60e905fa6 (patch)
treea188264fd550f9473ee3f1faa74d56ca9fd319fc /test/web/salmon
parent4a602230e4b95e916b3df73bd88413b245e07de0 (diff)
parenta9e3e387c9798a810f82bbf92023b4d29abffbe5 (diff)
downloadpleroma-114b95cee20c9bb4922627e5397a70d60e905fa6.tar.gz
pleroma-114b95cee20c9bb4922627e5397a70d60e905fa6.zip
Merge branch 'feature/integration_tesla' into 'develop'
[#354] Move all http interactions to Tesla See merge request pleroma/pleroma!487
Diffstat (limited to 'test/web/salmon')
-rw-r--r--test/web/salmon/salmon_test.exs6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index 1b39b4b2d..23ccc038e 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -3,6 +3,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
alias Pleroma.Web.Salmon
alias Pleroma.{Repo, Activity, User}
import Pleroma.Factory
+ import Tesla.Mock
@magickey "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwQhh-1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB"
@@ -10,6 +11,11 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
@magickey_friendica "RSA.AMwa8FUs2fWEjX0xN7yRQgegQffhBpuKNC6fa5VNSVorFjGZhRrlPMn7TQOeihlc9lBz2OsHlIedbYn2uJ7yCs0.AQAB"
+ setup do
+ mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ :ok
+ end
+
test "decodes a salmon" do
{:ok, salmon} = File.read("test/fixtures/salmon.xml")
{:ok, doc} = Salmon.decode_and_validate(@magickey, salmon)