projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
[akkoma]
/
test
/
web
/
salmon
/
salmon_test.exs
diff --git
a/test/web/salmon/salmon_test.exs
b/test/web/salmon/salmon_test.exs
index 23ccc038ef6bc7cf6cc019aba3f0144dd9c2cd28..35503259b933cd2cfe0ba39a5553e4a836cdcffe 100644
(file)
--- a/
test/web/salmon/salmon_test.exs
+++ b/
test/web/salmon/salmon_test.exs
@@
-1,9
+1,14
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.Salmon.SalmonTest do
use Pleroma.DataCase
defmodule Pleroma.Web.Salmon.SalmonTest do
use Pleroma.DataCase
+ alias Pleroma.Activity
+ alias Pleroma.Repo
+ alias Pleroma.User
alias Pleroma.Web.Salmon
alias Pleroma.Web.Salmon
- alias Pleroma.{Repo, Activity, User}
import Pleroma.Factory
import Pleroma.Factory
- import Tesla.Mock
@magickey "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwQhh-1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB"
@magickey "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwQhh-1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB"
@@
-11,8
+16,8
@@
defmodule Pleroma.Web.Salmon.SalmonTest do
@magickey_friendica "RSA.AMwa8FUs2fWEjX0xN7yRQgegQffhBpuKNC6fa5VNSVorFjGZhRrlPMn7TQOeihlc9lBz2OsHlIedbYn2uJ7yCs0.AQAB"
@magickey_friendica "RSA.AMwa8FUs2fWEjX0xN7yRQgegQffhBpuKNC6fa5VNSVorFjGZhRrlPMn7TQOeihlc9lBz2OsHlIedbYn2uJ7yCs0.AQAB"
- setup do
-
mock
(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ setup
_all
do
+
Tesla.Mock.mock_global
(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end
:ok
end
@@
-75,7
+80,7
@@
defmodule Pleroma.Web.Salmon.SalmonTest do
test "it pushes an activity to remote accounts it's addressed to" do
user_data = %{
info: %{
test "it pushes an activity to remote accounts it's addressed to" do
user_data = %{
info: %{
-
"salmon" => "http://
example.org/salmon"
+
salmon: "http://test-
example.org/salmon"
},
local: false
}
},
local: false
}
@@
-94,11
+99,11
@@
defmodule Pleroma.Web.Salmon.SalmonTest do
}
{:ok, activity} = Repo.insert(%Activity{data: activity_data, recipients: activity_data["to"]})
}
{:ok, activity} = Repo.insert(%Activity{data: activity_data, recipients: activity_data["to"]})
- user =
Repo.get_by(User, ap_id:
activity.data["actor"])
+ user =
User.get_by_ap_id(
activity.data["actor"])
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
- poster = fn url, _data, _headers
, _options
->
- assert url == "http://example.org/salmon"
+ poster = fn url, _data, _headers ->
+ assert url == "http://
test-
example.org/salmon"
end
Salmon.publish(user, activity, poster)
end
Salmon.publish(user, activity, poster)