diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
| commit | 5ece901af3e887664653c79c5e61618cc5cf0ecf (patch) | |
| tree | 93fc7c3bdb70348d5ef91fa9f7db3293b17f9854 /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | fd920c897339b9cedea042dd6698d14380cedae7 (diff) | |
| parent | 8e9a764dfcde315afd055c8e63543bfca24cc41b (diff) | |
| download | pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.tar.gz pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.zip | |
Resolve merge conflicts and remove IO.inspects
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 90718cfb4..e194f14fb 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -1094,7 +1094,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do describe "GET /api/account/confirm_email/:id/:token" do setup do user = insert(:user) - info_change = User.Info.confirmation_changeset(user.info, :unconfirmed) + info_change = User.Info.confirmation_changeset(user.info, need_confirmation: true) {:ok, user} = user @@ -1145,7 +1145,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do end user = insert(:user) - info_change = User.Info.confirmation_changeset(user.info, :unconfirmed) + info_change = User.Info.confirmation_changeset(user.info, need_confirmation: true) {:ok, user} = user |