diff options
| author | lambda <lain@soykaf.club> | 2019-04-08 11:41:50 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-08 11:41:50 +0000 |
| commit | fd45cab9eccecc835dde457d72ba38bd31c8f7f6 (patch) | |
| tree | bcc6b53058cdf0a717e871d566fe923491bad99e /test/web/admin_api/admin_api_controller_test.exs | |
| parent | ff9290836b97f7358b056709e0891e01d641dd6d (diff) | |
| parent | 44829d91818e66da1cbeb13aafecc52a931af17d (diff) | |
| download | pleroma-fd45cab9eccecc835dde457d72ba38bd31c8f7f6.tar.gz | |
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index dd2fbfb15..ca6bd0e97 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -80,14 +80,13 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do user = insert(:user) follower = insert(:user) - conn = - build_conn() - |> assign(:user, admin) - |> put_req_header("accept", "application/json") - |> post("/api/pleroma/admin/user/follow", %{ - "follower" => follower.nickname, - "followed" => user.nickname - }) + build_conn() + |> assign(:user, admin) + |> put_req_header("accept", "application/json") + |> post("/api/pleroma/admin/user/follow", %{ + "follower" => follower.nickname, + "followed" => user.nickname + }) user = User.get_by_id(user.id) follower = User.get_by_id(follower.id) @@ -104,14 +103,13 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do User.follow(follower, user) - conn = - build_conn() - |> assign(:user, admin) - |> put_req_header("accept", "application/json") - |> post("/api/pleroma/admin/user/unfollow", %{ - "follower" => follower.nickname, - "followed" => user.nickname - }) + build_conn() + |> assign(:user, admin) + |> put_req_header("accept", "application/json") + |> post("/api/pleroma/admin/user/unfollow", %{ + "follower" => follower.nickname, + "followed" => user.nickname + }) user = User.get_by_id(user.id) follower = User.get_by_id(follower.id) |