summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/twitter_api_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-15 17:47:29 +0200
committerlain <lain@soykaf.club>2019-05-15 17:47:29 +0200
commitf168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (patch)
tree3c208baf52e27859491cce07954ac9b1198cbc8f /test/web/twitter_api/twitter_api_controller_test.exs
parent786f2c7a849bc4fa2bd4aac18de59ef6b2ed18c5 (diff)
parent62516be9c462ca206163eaf7822f9ee5c2470453 (diff)
downloadpleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.tar.gz
pleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.zip
Merge remote-tracking branch 'origin/develop' into conversations-import
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs4
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