diff options
| author | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-18 12:05:05 -0600 |
| commit | 44a86951a339fdb0146a237ca5178c83823629c7 (patch) | |
| tree | e38ad0c1ecf198a69762dfc95f158e649d9d4723 /test/pleroma/web/twitter_api | |
| parent | 63923df0a51fdae58daf71a8dd85929a29ab1546 (diff) | |
| parent | 0ad6ea205711df9d1c634f0ad2dde6d432544318 (diff) | |
| download | pleroma-44a86951a339fdb0146a237ca5178c83823629c7.tar.gz | |
Merge branch 'develop' into refactor/approval_pending_user_field
Diffstat (limited to 'test/pleroma/web/twitter_api')
| -rw-r--r-- | test/pleroma/web/twitter_api/controller_test.exs | 6 | ||||
| -rw-r--r-- | test/pleroma/web/twitter_api/twitter_api_test.exs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/pleroma/web/twitter_api/controller_test.exs b/test/pleroma/web/twitter_api/controller_test.exs index 23884e223..583c904b2 100644 --- a/test/pleroma/web/twitter_api/controller_test.exs +++ b/test/pleroma/web/twitter_api/controller_test.exs @@ -64,10 +64,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do setup do {:ok, user} = insert(:user) - |> User.confirmation_changeset(need_confirmation: true) + |> User.confirmation_changeset(set_confirmation: false) |> Repo.update() - assert user.confirmation_pending + refute user.is_confirmed [user: user] end @@ -83,7 +83,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do user = User.get_cached_by_id(user.id) - refute user.confirmation_pending + assert user.is_confirmed refute user.confirmation_token end diff --git a/test/pleroma/web/twitter_api/twitter_api_test.exs b/test/pleroma/web/twitter_api/twitter_api_test.exs index 05152ee21..129ffdf4d 100644 --- a/test/pleroma/web/twitter_api/twitter_api_test.exs +++ b/test/pleroma/web/twitter_api/twitter_api_test.exs @@ -65,7 +65,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do {:ok, user} = TwitterAPI.register_user(data) ObanHelpers.perform_all() - assert user.confirmation_pending + refute user.is_confirmed email = Pleroma.Emails.UserEmail.account_confirmation_email(user) |