diff options
author | kaniini <nenolod@gmail.com> | 2019-03-03 15:48:00 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-03-03 15:48:00 +0000 |
commit | dfdbb6f125090d55de1afd755cd55f2e1f7e77bc (patch) | |
tree | 25370c9f95e2e8e9b17ef5b7015d95ce16bd034c /test/web/twitter_api/twitter_api_controller_test.exs | |
parent | 9b63fda9c70f0fd3030ada951f3514221ae2e3aa (diff) | |
parent | d5418e9ff78785c48bc94fbc8cb146ffe90c1fc5 (diff) | |
download | pleroma-dfdbb6f125090d55de1afd755cd55f2e1f7e77bc.tar.gz |
Merge branch 'remove-follow-request-count' into 'develop'
Remove follow_request_count as it's not needed for FE anymore.
See merge request pleroma/pleroma!886
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 7125d85ab..d18b65876 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -690,7 +690,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do followed = Repo.get(User, followed.id) refute User.ap_followers(followed) in current_user.following - assert followed.info.follow_request_count == 1 assert json_response(conn, 200) == UserView.render("show.json", %{user: followed, for: current_user}) @@ -1757,7 +1756,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do other_user = Repo.get(User, other_user.id) assert User.following?(other_user, user) == false - assert user.info.follow_request_count == 1 conn = build_conn() @@ -1769,7 +1767,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do assert relationship = json_response(conn, 200) assert other_user.id == relationship["id"] assert relationship["follows_you"] == true - assert user.info.follow_request_count == 0 end end @@ -1784,7 +1781,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do other_user = Repo.get(User, other_user.id) assert User.following?(other_user, user) == false - assert user.info.follow_request_count == 1 conn = build_conn() @@ -1796,7 +1792,6 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do assert relationship = json_response(conn, 200) assert other_user.id == relationship["id"] assert relationship["follows_you"] == false - assert user.info.follow_request_count == 0 end end |