diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-20 14:48:48 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-20 14:48:48 +0300 |
| commit | 7cab7de9ff0432a582cfca0852a4b66fdd124c41 (patch) | |
| tree | 48169618f7edccd5a56ecf06cb08f79f444be53d /test | |
| parent | f69cbf4755b974de0303731327180bb51ed244fc (diff) | |
| download | pleroma-7cab7de9ff0432a582cfca0852a4b66fdd124c41.tar.gz | |
[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 16422c35a..1324bcc71 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -919,6 +919,13 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do describe "POST /api/account/resend_confirmation_email" do setup do + setting = Pleroma.Config.get([:instance, :account_activation_required]) + + unless setting do + Pleroma.Config.put([:instance, :account_activation_required], true) + on_exit(fn -> Pleroma.Config.put([:instance, :account_activation_required], setting) end) + end + user = insert(:user) info_change = User.Info.confirmation_changeset(user.info, :unconfirmed) |