projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OpenAPI spec for ReportController
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
status_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/status_controller_test.exs
b/test/web/mastodon_api/controllers/status_controller_test.exs
index 6b126217a50031b51a4df49d8cb7d292b134f515..85068edd00eddf9a0551073ed6273d1962604f6d 100644
(file)
--- a/
test/web/mastodon_api/controllers/status_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/status_controller_test.exs
@@
-302,6
+302,17
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
assert [] == Repo.all(Activity)
end
assert [] == Repo.all(Activity)
end
+ test "ignores nil values", %{conn: conn} do
+ conn =
+ post(conn, "/api/v1/statuses", %{
+ "status" => "not scheduled",
+ "scheduled_at" => nil
+ })
+
+ assert result = json_response(conn, 200)
+ assert Activity.get_by_id(result["id"])
+ end
+
test "creates a scheduled activity with a media attachment", %{user: user, conn: conn} do
scheduled_at = NaiveDateTime.add(NaiveDateTime.utc_now(), :timer.minutes(120), :millisecond)
test "creates a scheduled activity with a media attachment", %{user: user, conn: conn} do
scheduled_at = NaiveDateTime.add(NaiveDateTime.utc_now(), :timer.minutes(120), :millisecond)
@@
-775,7
+786,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
user1 = insert(:user)
user2 = insert(:user)
user3 = insert(:user)
user1 = insert(:user)
user2 = insert(:user)
user3 = insert(:user)
-
CommonAPI.favorite(activity.id, user2
)
+
{:ok, _} = CommonAPI.favorite(user2, activity.id
)
{:ok, _bookmark} = Pleroma.Bookmark.create(user2.id, activity.id)
{:ok, reblog_activity1, _object} = CommonAPI.repeat(activity.id, user1)
{:ok, _, _object} = CommonAPI.repeat(activity.id, user2)
{:ok, _bookmark} = Pleroma.Bookmark.create(user2.id, activity.id)
{:ok, reblog_activity1, _object} = CommonAPI.repeat(activity.id, user1)
{:ok, _, _object} = CommonAPI.repeat(activity.id, user2)
@@
-850,11
+861,15
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
activity = insert(:note_activity)
post(conn, "/api/v1/statuses/#{activity.id}/favourite")
activity = insert(:note_activity)
post(conn, "/api/v1/statuses/#{activity.id}/favourite")
- assert post(conn, "/api/v1/statuses/#{activity.id}/favourite") |> json_response(200)
+
+ assert post(conn, "/api/v1/statuses/#{activity.id}/favourite")
+ |> json_response(200)
end
test "returns 404 error for a wrong id", %{conn: conn} do
end
test "returns 404 error for a wrong id", %{conn: conn} do
- conn = post(conn, "/api/v1/statuses/1/favourite")
+ conn =
+ conn
+ |> post("/api/v1/statuses/1/favourite")
assert json_response(conn, 404) == %{"error" => "Record not found"}
end
assert json_response(conn, 404) == %{"error" => "Record not found"}
end
@@
-866,7
+881,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
test "unfavorites a status and returns it", %{user: user, conn: conn} do
activity = insert(:note_activity)
test "unfavorites a status and returns it", %{user: user, conn: conn} do
activity = insert(:note_activity)
- {:ok, _
, _} = CommonAPI.favorite(activity.id, user
)
+ {:ok, _
} = CommonAPI.favorite(user, activity.id
)
conn = post(conn, "/api/v1/statuses/#{activity.id}/unfavourite")
conn = post(conn, "/api/v1/statuses/#{activity.id}/unfavourite")
@@
-1178,7
+1193,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
test "returns users who have favorited the status", %{conn: conn, activity: activity} do
other_user = insert(:user)
test "returns users who have favorited the status", %{conn: conn, activity: activity} do
other_user = insert(:user)
- {:ok, _
, _} = CommonAPI.favorite(activity.id, other_user
)
+ {:ok, _
} = CommonAPI.favorite(other_user, activity.id
)
response =
conn
response =
conn
@@
-1209,7
+1224,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
other_user = insert(:user)
{:ok, _user_relationship} = User.block(user, other_user)
other_user = insert(:user)
{:ok, _user_relationship} = User.block(user, other_user)
- {:ok, _
, _} = CommonAPI.favorite(activity.id, other_user
)
+ {:ok, _
} = CommonAPI.favorite(other_user, activity.id
)
response =
conn
response =
conn
@@
-1221,7
+1236,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
test "does not fail on an unauthenticated request", %{activity: activity} do
other_user = insert(:user)
test "does not fail on an unauthenticated request", %{activity: activity} do
other_user = insert(:user)
- {:ok, _
, _} = CommonAPI.favorite(activity.id, other_user
)
+ {:ok, _
} = CommonAPI.favorite(other_user, activity.id
)
response =
build_conn()
response =
build_conn()
@@
-1241,7
+1256,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
"visibility" => "direct"
})
"visibility" => "direct"
})
- {:ok, _
, _} = CommonAPI.favorite(activity.id, other_user
)
+ {:ok, _
} = CommonAPI.favorite(other_user, activity.id
)
favourited_by_url = "/api/v1/statuses/#{activity.id}/favourited_by"
favourited_by_url = "/api/v1/statuses/#{activity.id}/favourited_by"
@@
-1401,7
+1416,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
{:ok, _} = CommonAPI.post(other_user, %{"status" => "bla"})
{:ok, activity} = CommonAPI.post(other_user, %{"status" => "traps are happy"})
{:ok, _} = CommonAPI.post(other_user, %{"status" => "bla"})
{:ok, activity} = CommonAPI.post(other_user, %{"status" => "traps are happy"})
- {:ok, _
, _} = CommonAPI.favorite(activity.id, user
)
+ {:ok, _
} = CommonAPI.favorite(user, activity.id
)
first_conn = get(conn, "/api/v1/favourites")
first_conn = get(conn, "/api/v1/favourites")
@@
-1418,7
+1433,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
"Trees Are Never Sad Look At Them Every Once In Awhile They're Quite Beautiful."
})
"Trees Are Never Sad Look At Them Every Once In Awhile They're Quite Beautiful."
})
- {:ok, _
, _} = CommonAPI.favorite(second_activity.id, user
)
+ {:ok, _
} = CommonAPI.favorite(user, second_activity.id
)
last_like = status["id"]
last_like = status["id"]