projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing with_move parameter
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
domain_block_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/domain_block_controller_test.exs
b/test/web/mastodon_api/controllers/domain_block_controller_test.exs
index 25a279cdcb74911982f8fd43a750bdba050dd9ed..8d24b3b882dbfba98ac2e3ede22053744c935162 100644
(file)
--- a/
test/web/mastodon_api/controllers/domain_block_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/domain_block_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.DomainBlockControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.DomainBlockControllerTest do
@@
-9,31
+9,25
@@
defmodule Pleroma.Web.MastodonAPI.DomainBlockControllerTest do
import Pleroma.Factory
import Pleroma.Factory
- test "blocking / unblocking a domain"
, %{conn: conn}
do
-
user = insert(:user
)
+ test "blocking / unblocking a domain" do
+
%{user: user, conn: conn} = oauth_access(["write:blocks"]
)
other_user = insert(:user, %{ap_id: "https://dogwhistle.zone/@pundit"})
other_user = insert(:user, %{ap_id: "https://dogwhistle.zone/@pundit"})
- conn =
- conn
- |> assign(:user, user)
- |> post("/api/v1/domain_blocks", %{"domain" => "dogwhistle.zone"})
+ ret_conn = post(conn, "/api/v1/domain_blocks", %{"domain" => "dogwhistle.zone"})
- assert %{} = json_response(conn, 200)
+ assert %{} = json_response(
ret_
conn, 200)
user = User.get_cached_by_ap_id(user.ap_id)
assert User.blocks?(user, other_user)
user = User.get_cached_by_ap_id(user.ap_id)
assert User.blocks?(user, other_user)
- conn =
- build_conn()
- |> assign(:user, user)
- |> delete("/api/v1/domain_blocks", %{"domain" => "dogwhistle.zone"})
+ ret_conn = delete(conn, "/api/v1/domain_blocks", %{"domain" => "dogwhistle.zone"})
- assert %{} = json_response(conn, 200)
+ assert %{} = json_response(
ret_
conn, 200)
user = User.get_cached_by_ap_id(user.ap_id)
refute User.blocks?(user, other_user)
end
user = User.get_cached_by_ap_id(user.ap_id)
refute User.blocks?(user, other_user)
end
- test "getting a list of domain blocks"
, %{conn: conn}
do
-
user = insert(:user
)
+ test "getting a list of domain blocks" do
+
%{user: user, conn: conn} = oauth_access(["read:blocks"]
)
{:ok, user} = User.block_domain(user, "bad.site")
{:ok, user} = User.block_domain(user, "even.worse.site")
{:ok, user} = User.block_domain(user, "bad.site")
{:ok, user} = User.block_domain(user, "even.worse.site")