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 gun
[akkoma]
/
test
/
web
/
common_api
/
common_api_utils_test.exs
diff --git
a/test/web/common_api/common_api_utils_test.exs
b/test/web/common_api/common_api_utils_test.exs
index c281dd1f1c2f0e785de02eb7adb39368293ec477..759501a677c739ee59dec11868abeb7af583ec51 100644
(file)
--- a/
test/web/common_api/common_api_utils_test.exs
+++ b/
test/web/common_api/common_api_utils_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.UtilsTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.UtilsTest do
@@
-157,11
+157,11
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*"
expected =
text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*"
expected =
-
"<p><strong>hello world</strong></p>\n<p><em>another <span class=\"h-card\"><a data-user=\
"#{
+
~s(<p><strong>hello world</strong></p>\n<p><em>another <span class="h-card"><a data-user=
"#{
user.id
user.id
- }
\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> and <span class=\"h-card\"><a data-user=\
"#{
+ }
" class="u-url mention" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> and <span class="h-card"><a data-user=
"#{
user.id
user.id
- }
\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> <a href=\"http://google.com\">google.com</a> paragraph</em></p>\n"
+ }
" class="u-url mention" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> <a href="http://google.com" rel="ugc">google.com</a> paragraph</em></p>\n)
{output, _, _} = Utils.format_input(text, "text/markdown")
{output, _, _} = Utils.format_input(text, "text/markdown")
@@
-307,7
+307,7
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
{to, cc} = Utils.get_to_and_cc(user, mentions, nil, "private", nil)
assert length(to) == 2
{to, cc} = Utils.get_to_and_cc(user, mentions, nil, "private", nil)
assert length(to) == 2
- assert
length(cc) == 0
+ assert
Enum.empty?(cc)
assert mentioned_user.ap_id in to
assert user.follower_address in to
assert mentioned_user.ap_id in to
assert user.follower_address in to
@@
-323,7
+323,7
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
{to, cc} = Utils.get_to_and_cc(user, mentions, activity, "private", nil)
assert length(to) == 3
{to, cc} = Utils.get_to_and_cc(user, mentions, activity, "private", nil)
assert length(to) == 3
- assert
length(cc) == 0
+ assert
Enum.empty?(cc)
assert mentioned_user.ap_id in to
assert third_user.ap_id in to
assert mentioned_user.ap_id in to
assert third_user.ap_id in to
@@
-338,7
+338,7
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
{to, cc} = Utils.get_to_and_cc(user, mentions, nil, "direct", nil)
assert length(to) == 1
{to, cc} = Utils.get_to_and_cc(user, mentions, nil, "direct", nil)
assert length(to) == 1
- assert
length(cc) == 0
+ assert
Enum.empty?(cc)
assert mentioned_user.ap_id in to
end
assert mentioned_user.ap_id in to
end
@@
-353,7
+353,7
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
{to, cc} = Utils.get_to_and_cc(user, mentions, activity, "direct", nil)
assert length(to) == 2
{to, cc} = Utils.get_to_and_cc(user, mentions, activity, "direct", nil)
assert length(to) == 2
- assert
length(cc) == 0
+ assert
Enum.empty?(cc)
assert mentioned_user.ap_id in to
assert third_user.ap_id in to
assert mentioned_user.ap_id in to
assert third_user.ap_id in to
@@
-474,6
+474,13
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
activity = insert(:note_activity, user: user, note: object)
Pleroma.Repo.delete(object)
activity = insert(:note_activity, user: user, note: object)
Pleroma.Repo.delete(object)
+ obj_url = activity.data["object"]
+
+ Tesla.Mock.mock(fn
+ %{method: :get, url: ^obj_url} ->
+ %Tesla.Env{status: 404, body: ""}
+ end)
+
assert Utils.maybe_notify_mentioned_recipients(["test-test"], activity) == [
"test-test"
]
assert Utils.maybe_notify_mentioned_recipients(["test-test"], activity) == [
"test-test"
]
@@
-575,11
+582,11
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
end
describe "maybe_add_attachments/3" do
end
describe "maybe_add_attachments/3" do
- test "returns parsed results when
no_links is tru
e" do
+ test "returns parsed results when
attachment_links is fals
e" do
assert Utils.maybe_add_attachments(
{"test", [], ["tags"]},
[],
assert Utils.maybe_add_attachments(
{"test", [], ["tags"]},
[],
-
tru
e
+
fals
e
) == {"test", [], ["tags"]}
end
) == {"test", [], ["tags"]}
end
@@
-589,7
+596,7
@@
defmodule Pleroma.Web.CommonAPI.UtilsTest do
assert Utils.maybe_add_attachments(
{"test", [], ["tags"]},
[attachment],
assert Utils.maybe_add_attachments(
{"test", [], ["tags"]},
[attachment],
-
fals
e
+
tru
e
) == {
"test<br><a href=\"SakuraPM.png\" class='attachment'>SakuraPM.png</a>",
[],
) == {
"test<br><a href=\"SakuraPM.png\" class='attachment'>SakuraPM.png</a>",
[],