projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users...
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
filter_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/filter_controller_test.exs
b/test/web/mastodon_api/controllers/filter_controller_test.exs
index 3aea17ec719569eb197dd71c4d839d7c40e26a23..f29547d13c00e6dcd4196405fb76f292b17a5409 100644
(file)
--- a/
test/web/mastodon_api/controllers/filter_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/filter_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.FilterControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
@@
-15,9
+15,12
@@
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
context: ["home"]
}
context: ["home"]
}
- conn = post(conn, "/api/v1/filters", %{"phrase" => filter.phrase, context: filter.context})
+ conn =
+ conn
+ |> put_req_header("content-type", "application/json")
+ |> post("/api/v1/filters", %{"phrase" => filter.phrase, context: filter.context})
- assert response = json_response(conn, 200)
+ assert response = json_response
_and_validate_schema
(conn, 200)
assert response["phrase"] == filter.phrase
assert response["context"] == filter.context
assert response["irreversible"] == false
assert response["phrase"] == filter.phrase
assert response["context"] == filter.context
assert response["irreversible"] == false
@@
-48,12
+51,12
@@
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
response =
conn
|> get("/api/v1/filters")
response =
conn
|> get("/api/v1/filters")
- |> json_response(200)
+ |> json_response
_and_validate_schema
(200)
assert response ==
render_json(
FilterView,
assert response ==
render_json(
FilterView,
- "
filters
.json",
+ "
index
.json",
filters: [filter_two, filter_one]
)
end
filters: [filter_two, filter_one]
)
end
@@
-72,7
+75,7
@@
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
conn = get(conn, "/api/v1/filters/#{filter.filter_id}")
conn = get(conn, "/api/v1/filters/#{filter.filter_id}")
- assert
_response = json_response
(conn, 200)
+ assert
response = json_response_and_validate_schema
(conn, 200)
end
test "update a filter" do
end
test "update a filter" do
@@
-82,7
+85,8
@@
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
user_id: user.id,
filter_id: 2,
phrase: "knight",
user_id: user.id,
filter_id: 2,
phrase: "knight",
- context: ["home"]
+ context: ["home"],
+ hide: true
}
{:ok, _filter} = Pleroma.Filter.create(query)
}
{:ok, _filter} = Pleroma.Filter.create(query)
@@
-93,14
+97,17
@@
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
}
conn =
}
conn =
- put(conn, "/api/v1/filters/#{query.filter_id}", %{
+ conn
+ |> put_req_header("content-type", "application/json")
+ |> put("/api/v1/filters/#{query.filter_id}", %{
phrase: new.phrase,
context: new.context
})
phrase: new.phrase,
context: new.context
})
- assert response = json_response(conn, 200)
+ assert response = json_response
_and_validate_schema
(conn, 200)
assert response["phrase"] == new.phrase
assert response["context"] == new.context
assert response["phrase"] == new.phrase
assert response["context"] == new.context
+ assert response["irreversible"] == true
end
test "delete a filter" do
end
test "delete a filter" do
@@
-117,7
+124,6
@@
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
conn = delete(conn, "/api/v1/filters/#{filter.filter_id}")
conn = delete(conn, "/api/v1/filters/#{filter.filter_id}")
- assert response = json_response(conn, 200)
- assert response == %{}
+ assert json_response_and_validate_schema(conn, 200) == %{}
end
end
end
end