diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-25 04:59:06 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-25 04:59:06 +0000 |
| commit | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (patch) | |
| tree | 33da1ceebc81b01a0afabc324c37fefd1352711d /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 9bf1a4234da5125d27c21fb2d4212377348ec123 (diff) | |
| parent | a3ba72d97849ba12a5ea4008bd0b97e80bdd588b (diff) | |
| download | pleroma-4df71cd88b2725f1838c2899b3078a74dbb0c33f.tar.gz pleroma-4df71cd88b2725f1838c2899b3078a74dbb0c33f.zip | |
Merge branch 'classic-flakeids' into 'develop'
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index f22cdd870..863abd10f 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -797,7 +797,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do |> with_credentials(current_user.nickname, "test") |> post("/api/favorites/create/1.json") - assert json_response(conn, 500) + assert json_response(conn, 400) end end @@ -1621,7 +1621,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do conn = build_conn() |> assign(:user, user) - |> post("/api/pleroma/friendships/approve", %{"user_id" => to_string(other_user.id)}) + |> post("/api/pleroma/friendships/approve", %{"user_id" => other_user.id}) assert relationship = json_response(conn, 200) assert other_user.id == relationship["id"] @@ -1644,7 +1644,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do conn = build_conn() |> assign(:user, user) - |> post("/api/pleroma/friendships/deny", %{"user_id" => to_string(other_user.id)}) + |> post("/api/pleroma/friendships/deny", %{"user_id" => other_user.id}) assert relationship = json_response(conn, 200) assert other_user.id == relationship["id"] |