diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
| commit | 4944498133d4a945650201226808b1f09d355014 (patch) | |
| tree | 02e83bac731ca6b391b63d826d8230bdb0fdaed8 /test/plugs/user_enabled_plug_test.exs | |
| parent | bac58b152495c3ebf72e3ad1c3102de075fcc366 (diff) | |
| parent | ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (diff) | |
| download | pleroma-4944498133d4a945650201226808b1f09d355014.tar.gz pleroma-4944498133d4a945650201226808b1f09d355014.zip | |
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
Diffstat (limited to 'test/plugs/user_enabled_plug_test.exs')
| -rw-r--r-- | test/plugs/user_enabled_plug_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/plugs/user_enabled_plug_test.exs b/test/plugs/user_enabled_plug_test.exs index ee4f72ccf..eeb167933 100644 --- a/test/plugs/user_enabled_plug_test.exs +++ b/test/plugs/user_enabled_plug_test.exs @@ -13,7 +13,7 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do end test "with a user that is deactivated, it removes that user", %{conn: conn} do - user = insert(:user, info: %{"deactivated" => true}) + user = insert(:user, info: %{deactivated: true}) conn = conn |