projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'issue/1975'
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
account_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/account_controller_test.exs
b/test/web/mastodon_api/controllers/account_controller_test.exs
index 2cb3886554c345b1b5ad939e224d0457df97677d..f7f1369e48e35d70a19d925a2a3c2d2f66a05b00 100644
(file)
--- a/
test/web/mastodon_api/controllers/account_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/account_controller_test.exs
@@
-956,7
+956,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
|> put_req_header("authorization", "Bearer " <> token)
|> post("/api/v1/accounts", params)
|> put_req_header("authorization", "Bearer " <> token)
|> post("/api/v1/accounts", params)
- assert %{"error" => "{\"email\":[\"
Email domain is blacklisted
\"]}"} =
+ assert %{"error" => "{\"email\":[\"
Invalid email
\"]}"} =
json_response_and_validate_schema(conn, 400)
Pleroma.Config.put([User, :email_blacklist], [])
json_response_and_validate_schema(conn, 400)
Pleroma.Config.put([User, :email_blacklist], [])
@@
-1442,7
+1442,10
@@
defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
describe "verify_credentials" do
test "verify_credentials" do
%{user: user, conn: conn} = oauth_access(["read:accounts"])
describe "verify_credentials" do
test "verify_credentials" do
%{user: user, conn: conn} = oauth_access(["read:accounts"])
- [notification | _] = insert_list(7, :notification, user: user)
+
+ [notification | _] =
+ insert_list(7, :notification, user: user, activity: insert(:note_activity))
+
Pleroma.Notification.set_read_up_to(user, notification.id)
conn = get(conn, "/api/v1/accounts/verify_credentials")
Pleroma.Notification.set_read_up_to(user, notification.id)
conn = get(conn, "/api/v1/accounts/verify_credentials")