projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'
[akkoma]
/
test
/
web
/
activity_pub
/
activity_pub_controller_test.exs
diff --git
a/test/web/activity_pub/activity_pub_controller_test.exs
b/test/web/activity_pub/activity_pub_controller_test.exs
index fc0444c32f217153a4e61824f52f03b52b45aa2d..a5414c5210bc66b6f38c63ce70f14a07416bc6a8 100644
(file)
--- a/
test/web/activity_pub/activity_pub_controller_test.exs
+++ b/
test/web/activity_pub/activity_pub_controller_test.exs
@@
-764,7
+764,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
test "it returns returns a uri if the user has 'hide_followers' set", %{conn: conn} do
user = insert(:user)
test "it returns returns a uri if the user has 'hide_followers' set", %{conn: conn} do
user = insert(:user)
- user_two = insert(:user,
%{info: %{hide_followers: true}}
)
+ user_two = insert(:user,
hide_followers: true
)
User.follow(user, user_two)
result =
User.follow(user, user_two)
result =
@@
-777,7
+777,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
test "it returns a 403 error on pages, if the user has 'hide_followers' set and the request is not authenticated",
%{conn: conn} do
test "it returns a 403 error on pages, if the user has 'hide_followers' set and the request is not authenticated",
%{conn: conn} do
- user = insert(:user,
%{info: %{hide_followers: true}}
)
+ user = insert(:user,
hide_followers: true
)
result =
conn
result =
conn
@@
-789,7
+789,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
test "it renders the page, if the user has 'hide_followers' set and the request is authenticated with the same user",
%{conn: conn} do
test "it renders the page, if the user has 'hide_followers' set and the request is authenticated with the same user",
%{conn: conn} do
- user = insert(:user,
%{info: %{hide_followers: true}}
)
+ user = insert(:user,
hide_followers: true
)
other_user = insert(:user)
{:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
other_user = insert(:user)
{:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
@@
-845,7
+845,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
end
test "it returns a uri if the user has 'hide_follows' set", %{conn: conn} do
end
test "it returns a uri if the user has 'hide_follows' set", %{conn: conn} do
- user = insert(:user,
%{info: %{hide_follows: true}}
)
+ user = insert(:user,
hide_follows: true
)
user_two = insert(:user)
User.follow(user, user_two)
user_two = insert(:user)
User.follow(user, user_two)
@@
-859,7
+859,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
test "it returns a 403 error on pages, if the user has 'hide_follows' set and the request is not authenticated",
%{conn: conn} do
test "it returns a 403 error on pages, if the user has 'hide_follows' set and the request is not authenticated",
%{conn: conn} do
- user = insert(:user,
%{info: %{hide_follows: true}}
)
+ user = insert(:user,
hide_follows: true
)
result =
conn
result =
conn
@@
-871,7
+871,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
test "it renders the page, if the user has 'hide_follows' set and the request is authenticated with the same user",
%{conn: conn} do
test "it renders the page, if the user has 'hide_follows' set and the request is authenticated with the same user",
%{conn: conn} do
- user = insert(:user,
%{info: %{hide_follows: true}}
)
+ user = insert(:user,
hide_follows: true
)
other_user = insert(:user)
{:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)
other_user = insert(:user)
{:ok, user, _other_user, _activity} = CommonAPI.follow(user, other_user)