diff options
| author | lain <lain@soykaf.club> | 2019-12-10 13:34:54 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-10 13:34:54 +0000 |
| commit | 1ae976ac51d5ad7c224fa4d1ddee0bbd007d6787 (patch) | |
| tree | 1e0b4fa5d7ca5d12ac2d41ee5a077f669f64fb43 /test | |
| parent | 835ac2157c53e8c85bd3759efe061dbfbdfc367e (diff) | |
| parent | 54b1b2c9c0c24165b5b32c352fa684eed28bfa93 (diff) | |
| download | pleroma-1ae976ac51d5ad7c224fa4d1ddee0bbd007d6787.tar.gz pleroma-1ae976ac51d5ad7c224fa4d1ddee0bbd007d6787.zip | |
Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/mastodon_api/views/account_view_test.exs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs index 5e297d129..2107bb85c 100644 --- a/test/web/mastodon_api/views/account_view_test.exs +++ b/test/web/mastodon_api/views/account_view_test.exs @@ -66,6 +66,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do note: "valid html", sensitive: false, pleroma: %{ + actor_type: "Person", discoverable: false }, fields: [] @@ -106,7 +107,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do insert(:user, %{ follower_count: 3, note_count: 5, - source_data: %{"type" => "Service"}, + source_data: %{}, + actor_type: "Service", nickname: "shp@shitposter.club", inserted_at: ~N[2017-08-15 15:47:06.597036] }) @@ -134,6 +136,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do note: user.bio, sensitive: false, pleroma: %{ + actor_type: "Service", discoverable: false }, fields: [] @@ -278,7 +281,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do insert(:user, %{ follower_count: 0, note_count: 5, - source_data: %{"type" => "Service"}, + source_data: %{}, + actor_type: "Service", nickname: "shp@shitposter.club", inserted_at: ~N[2017-08-15 15:47:06.597036] }) @@ -311,6 +315,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do note: user.bio, sensitive: false, pleroma: %{ + actor_type: "Service", discoverable: false }, fields: [] |