projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Reblog content should be ""' (#489) from masto4-reboost into...
[akkoma]
/
test
/
pleroma
/
web
/
pleroma_api
/
controllers
/
account_controller_test.exs
diff --git
a/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
b/test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
index 07909d48bd806f8c2c1b65e88cabe8563326f665..89a2cf634d181d005b744e9cc3a88868e1673cd0 100644
(file)
--- a/
test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
+++ b/
test/pleroma/web/pleroma_api/controllers/account_controller_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 Pleroma.Web.PleromaAPI.AccountControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
@@
-17,10
+17,10
@@
defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
setup do
{:ok, user} =
insert(:user)
setup do
{:ok, user} =
insert(:user)
- |> User.confirmation_changeset(
need_confirmation: tru
e)
+ |> User.confirmation_changeset(
set_confirmation: fals
e)
|> User.update_and_set_cache()
|> User.update_and_set_cache()
- assert user.confirmation_pending
+ refute user.is_confirmed
[user: user]
end
[user: user]
end
@@
-133,7
+133,7
@@
defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
|> get("/api/v1/pleroma/accounts/#{user.id}/favourites")
|> json_response_and_validate_schema(200)
|> get("/api/v1/pleroma/accounts/#{user.id}/favourites")
|> json_response_and_validate_schema(200)
- assert
length(response) == 0
+ assert
response == []
end
test "does not return others' favorited DM when user is not one of recipients", %{
end
test "does not return others' favorited DM when user is not one of recipients", %{
@@
-174,9
+174,7
@@
defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
response =
conn
|> get(
response =
conn
|> get(
- "/api/v1/pleroma/accounts/#{user.id}/favourites?since_id=#{third_activity.id}&max_id=#{
- seventh_activity.id
- }"
+ "/api/v1/pleroma/accounts/#{user.id}/favourites?since_id=#{third_activity.id}&max_id=#{seventh_activity.id}"
)
|> json_response_and_validate_schema(:ok)
)
|> json_response_and_validate_schema(:ok)