diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-13 18:35:45 +0000 | 
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-13 18:35:45 +0000 | 
| commit | f3e8f5b1f208b10130c7123e68af1e38575f180b (patch) | |
| tree | 523d1f1cfa399f4ee6d841ba3098ecd87d8e67e7 /test/web/twitter_api | |
| parent | 5a4d55cf910f85b07f111972647a8b4410b5eb6b (diff) | |
| parent | a2be420f940fb8f181feeb9b0fb9759d433dcae1 (diff) | |
| download | pleroma-f3e8f5b1f208b10130c7123e68af1e38575f180b.tar.gz pleroma-f3e8f5b1f208b10130c7123e68af1e38575f180b.zip | |
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'
Features/mastoapi/2.7.0 registration
Closes #773
See merge request pleroma/pleroma!1134
Diffstat (limited to 'test/web/twitter_api')
| -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 | 
