projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update AdminFE bundle
[akkoma]
/
test
/
mix
/
tasks
/
pleroma
/
email_test.exs
diff --git
a/test/mix/tasks/pleroma/email_test.exs
b/test/mix/tasks/pleroma/email_test.exs
index 78cdf178b08a0cdbefbf55afc8867c464f39a0f4..ce68b88defd08a73830275e99773c957ced8706b 100644
(file)
--- a/
test/mix/tasks/pleroma/email_test.exs
+++ b/
test/mix/tasks/pleroma/email_test.exs
@@
-61,18
+61,18
@@
defmodule Mix.Tasks.Pleroma.EmailTest do
test "Sends confirmation emails" do
local_user1 =
insert(:user, %{
test "Sends confirmation emails" do
local_user1 =
insert(:user, %{
-
confirmation_pending: tru
e,
+
is_confirmed: fals
e,
confirmation_token: "mytoken",
confirmation_token: "mytoken",
-
deactivated: fals
e,
+
is_active: tru
e,
email: "local1@pleroma.com",
local: true
})
local_user2 =
insert(:user, %{
email: "local1@pleroma.com",
local: true
})
local_user2 =
insert(:user, %{
-
confirmation_pending: tru
e,
+
is_confirmed: fals
e,
confirmation_token: "mytoken",
confirmation_token: "mytoken",
-
deactivated: fals
e,
+
is_active: tru
e,
email: "local2@pleroma.com",
local: true
})
email: "local2@pleroma.com",
local: true
})
@@
-88,30
+88,30
@@
defmodule Mix.Tasks.Pleroma.EmailTest do
test "Does not send confirmation email to inappropriate users" do
# confirmed user
insert(:user, %{
test "Does not send confirmation email to inappropriate users" do
# confirmed user
insert(:user, %{
-
confirmation_pending: fals
e,
+
is_confirmed: tru
e,
confirmation_token: "mytoken",
confirmation_token: "mytoken",
-
deactivated: fals
e,
+
is_active: tru
e,
email: "confirmed@pleroma.com",
local: true
})
# remote user
insert(:user, %{
email: "confirmed@pleroma.com",
local: true
})
# remote user
insert(:user, %{
-
deactivated: fals
e,
+
is_active: tru
e,
email: "remote@not-pleroma.com",
local: false
})
# deactivated user =
insert(:user, %{
email: "remote@not-pleroma.com",
local: false
})
# deactivated user =
insert(:user, %{
-
deactivated: tru
e,
+
is_active: fals
e,
email: "deactivated@pleroma.com",
local: false
})
# invisible user
insert(:user, %{
email: "deactivated@pleroma.com",
local: false
})
# invisible user
insert(:user, %{
-
deactivated: fals
e,
+
is_active: tru
e,
email: "invisible@pleroma.com",
local: true,
invisible: true
email: "invisible@pleroma.com",
local: true,
invisible: true