projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'copyright-fun' into 'develop'
[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 9523aefd884fa48e9479ac06da0eb1ec1b11e98a..ef26142c4a830ef67c5b3b1a433b5cfe63213769 100644
(file)
--- a/
test/mix/tasks/pleroma/email_test.exs
+++ b/
test/mix/tasks/pleroma/email_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.EmailTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.EmailTest do
@@
-61,7
+61,7
@@
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",
deactivated: false,
email: "local1@pleroma.com",
confirmation_token: "mytoken",
deactivated: false,
email: "local1@pleroma.com",
@@
-70,7
+70,7
@@
defmodule Mix.Tasks.Pleroma.EmailTest do
local_user2 =
insert(:user, %{
local_user2 =
insert(:user, %{
-
confirmation_pending: tru
e,
+
is_confirmed: fals
e,
confirmation_token: "mytoken",
deactivated: false,
email: "local2@pleroma.com",
confirmation_token: "mytoken",
deactivated: false,
email: "local2@pleroma.com",
@@
-88,7
+88,7
@@
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",
deactivated: false,
email: "confirmed@pleroma.com",
confirmation_token: "mytoken",
deactivated: false,
email: "confirmed@pleroma.com",