Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email See merge request pleroma/pleroma!2246
This commit is contained in:
parent
e3ccaeaa53
commit
e7837bc14e
5 changed files with 90 additions and 5 deletions
|
|
@ -412,7 +412,11 @@ defmodule Pleroma.UserTest do
|
|||
assert activity.actor == welcome_user.ap_id
|
||||
end
|
||||
|
||||
test "it requires an email, name, nickname and password, bio is optional" do
|
||||
clear_config([:instance, :account_activation_required])
|
||||
|
||||
test "it requires an email, name, nickname and password, bio is optional when account_activation_required is enabled" do
|
||||
Pleroma.Config.put([:instance, :account_activation_required], true)
|
||||
|
||||
@full_user_data
|
||||
|> Map.keys()
|
||||
|> Enum.each(fn key ->
|
||||
|
|
@ -423,6 +427,19 @@ defmodule Pleroma.UserTest do
|
|||
end)
|
||||
end
|
||||
|
||||
test "it requires an name, nickname and password, bio and email are optional when account_activation_required is disabled" do
|
||||
Pleroma.Config.put([:instance, :account_activation_required], false)
|
||||
|
||||
@full_user_data
|
||||
|> Map.keys()
|
||||
|> Enum.each(fn key ->
|
||||
params = Map.delete(@full_user_data, key)
|
||||
changeset = User.register_changeset(%User{}, params)
|
||||
|
||||
assert if key in [:bio, :email], do: changeset.valid?, else: not changeset.valid?
|
||||
end)
|
||||
end
|
||||
|
||||
test "it restricts certain nicknames" do
|
||||
[restricted_name | _] = Pleroma.Config.get([User, :restricted_nicknames])
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue