projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'get-cached-everywhere' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
account_view_test.exs
diff --git
a/test/web/mastodon_api/account_view_test.exs
b/test/web/mastodon_api/account_view_test.exs
index aa6a1e960b75992a9a4c4cdb66f7179e737eece1..0730201bddd742c48838d1a8f1cee911bb4c9d24 100644
(file)
--- a/
test/web/mastodon_api/account_view_test.exs
+++ b/
test/web/mastodon_api/account_view_test.exs
@@
-156,6
+156,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
blocking: true,
muting: false,
muting_notifications: false,
blocking: true,
muting: false,
muting_notifications: false,
+ subscribing: false,
requested: false,
domain_blocking: false,
showing_reblogs: true,
requested: false,
domain_blocking: false,
showing_reblogs: true,
@@
-168,15
+169,15
@@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
test "represent an embedded relationship" do
user =
insert(:user, %{
test "represent an embedded relationship" do
user =
insert(:user, %{
- info: %{note_count: 5, follower_count:
3
, source_data: %{"type" => "Service"}},
+ info: %{note_count: 5, follower_count:
0
, source_data: %{"type" => "Service"}},
nickname: "shp@shitposter.club",
inserted_at: ~N[2017-08-15 15:47:06.597036]
})
other_user = insert(:user)
nickname: "shp@shitposter.club",
inserted_at: ~N[2017-08-15 15:47:06.597036]
})
other_user = insert(:user)
-
{:ok, other_user} = User.follow(other_user, user)
{:ok, other_user} = User.block(other_user, user)
{:ok, other_user} = User.follow(other_user, user)
{:ok, other_user} = User.block(other_user, user)
+ {:ok, _} = User.follow(insert(:user), user)
expected = %{
id: to_string(user.id),
expected = %{
id: to_string(user.id),
@@
-185,7
+186,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
display_name: user.name,
locked: false,
created_at: "2017-08-15T15:47:06.000Z",
display_name: user.name,
locked: false,
created_at: "2017-08-15T15:47:06.000Z",
- followers_count:
3
,
+ followers_count:
1
,
following_count: 0,
statuses_count: 5,
note: user.bio,
following_count: 0,
statuses_count: 5,
note: user.bio,
@@
-212,6
+213,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
following: false,
followed_by: false,
blocking: true,
following: false,
followed_by: false,
blocking: true,
+ subscribing: false,
muting: false,
muting_notifications: false,
requested: false,
muting: false,
muting_notifications: false,
requested: false,