diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-20 13:28:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-20 13:28:36 +0000 |
| commit | 2e2030ada8b9aa00936057d47260cd03d01d92be (patch) | |
| tree | 9fb353e3eaccb1dbd82738cf44ae5015100f6711 /test/web/mastodon_api | |
| parent | 8de3138de07c0447ea3bc015ff71db25f8f9c931 (diff) | |
| parent | 851db74f1ca533f27f72f1341571948b15d2f561 (diff) | |
| download | pleroma-2e2030ada8b9aa00936057d47260cd03d01d92be.tar.gz pleroma-2e2030ada8b9aa00936057d47260cd03d01d92be.zip | |
Merge branch '114_email_confirmation' into 'develop'
[#114] Email confirmation
See merge request pleroma/pleroma!546
Diffstat (limited to 'test/web/mastodon_api')
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index 3cb9b9c5b..fec97c700 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -55,7 +55,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do privacy: "public", sensitive: false }, - pleroma: %{tags: []} + pleroma: %{ + confirmation_pending: false, + tags: [] + } } assert expected == AccountView.render("account.json", %{user: user}) @@ -93,7 +96,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do privacy: "public", sensitive: false }, - pleroma: %{tags: []} + pleroma: %{ + confirmation_pending: false, + tags: [] + } } assert expected == AccountView.render("account.json", %{user: user}) |