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 issue/1276
[akkoma]
/
test
/
web
/
mastodon_api
/
views
/
status_view_test.exs
diff --git
a/test/web/mastodon_api/views/status_view_test.exs
b/test/web/mastodon_api/views/status_view_test.exs
index fc110417cd35d6d52e15caa75df1c1ef2a9f7b60..9191730cd31f66cd79dfb33bd2f97b0946537439 100644
(file)
--- a/
test/web/mastodon_api/views/status_view_test.exs
+++ b/
test/web/mastodon_api/views/status_view_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
@@
-12,10
+12,12
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
+ alias Pleroma.UserRelationship
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
+
import Pleroma.Factory
import Tesla.Mock
import Pleroma.Factory
import Tesla.Mock
@@
-37,15
+39,15
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
status = StatusView.render("show.json", activity: activity)
assert status[:pleroma][:emoji_reactions] == [
status = StatusView.render("show.json", activity: activity)
assert status[:pleroma][:emoji_reactions] == [
- %{
emoji: "☕", count: 2, reacted
: false},
- %{
emoji: "🍵", count: 1, reacted
: false}
+ %{
name: "☕", count: 2, me
: false},
+ %{
name: "🍵", count: 1, me
: false}
]
status = StatusView.render("show.json", activity: activity, for: user)
assert status[:pleroma][:emoji_reactions] == [
]
status = StatusView.render("show.json", activity: activity, for: user)
assert status[:pleroma][:emoji_reactions] == [
- %{
emoji: "☕", count: 2, reacted
: true},
- %{
emoji: "🍵", count: 1, reacted
: false}
+ %{
name: "☕", count: 2, me
: true},
+ %{
name: "🍵", count: 1, me
: false}
]
end
]
end
@@
-212,12
+214,21
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
{:ok, _user_relationships} = User.mute(user, other_user)
{:ok, activity} = CommonAPI.post(other_user, %{"status" => "test"})
{:ok, _user_relationships} = User.mute(user, other_user)
{:ok, activity} = CommonAPI.post(other_user, %{"status" => "test"})
- status = StatusView.render("show.json", %{activity: activity})
+ relationships_opt = UserRelationship.view_relationships_option(user, [other_user])
+
+ opts = %{activity: activity}
+ status = StatusView.render("show.json", opts)
assert status.muted == false
assert status.muted == false
- status = StatusView.render("show.json", %{activity: activity, for: user})
+ status = StatusView.render("show.json", Map.put(opts, :relationships, relationships_opt))
+ assert status.muted == false
+ for_opts = %{activity: activity, for: user}
+ status = StatusView.render("show.json", for_opts)
+ assert status.muted == true
+
+ status = StatusView.render("show.json", Map.put(for_opts, :relationships, relationships_opt))
assert status.muted == true
end
assert status.muted == true
end
@@
-491,7
+502,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
title: "Example website"
}
title: "Example website"
}
- %{provider_name: "
Example site name
"} =
+ %{provider_name: "
example.com
"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end
StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end
@@
-506,7
+517,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
description: "Example description"
}
description: "Example description"
}
- %{provider_name: "
Example site name
"} =
+ %{provider_name: "
example.com
"} =
StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end
end
StatusView.render("card.json", %{page_url: page_url, rich_media: card})
end
end