Merge branch 'feature/help-test' into 'develop'
Add help/test resource See merge request !3
This commit is contained in:
commit
9a8f05e96d
@ -21,6 +21,8 @@ defmodule Pleroma.Web.Router do
|
||||
|
||||
scope "/api", Pleroma.Web do
|
||||
pipe_through :api
|
||||
|
||||
get "/help/test", TwitterAPI.Controller, :help_test
|
||||
get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
|
||||
get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline
|
||||
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
|
||||
|
@ -85,6 +85,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
||||
|> send_resp(200, response)
|
||||
end
|
||||
|
||||
def help_test(conn, _params) do
|
||||
conn |> json_reply(200, Poison.encode!("ok"))
|
||||
end
|
||||
|
||||
def upload_json(conn, %{"media" => media}) do
|
||||
response = TwitterAPI.upload(media, "json")
|
||||
conn
|
||||
|
@ -157,6 +157,12 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
||||
end
|
||||
end
|
||||
|
||||
describe "GET /help/test.json" do
|
||||
test "returns \"ok\"", %{conn: conn} do
|
||||
conn = get conn, "/api/help/test.json"
|
||||
assert json_response(conn, 200) == "ok"
|
||||
end
|
||||
|
||||
describe "POST /api/qvitter/update_avatar.json" do
|
||||
setup [:valid_user]
|
||||
test "without valid credentials", %{conn: conn} do
|
||||
|
Loading…
Reference in New Issue
Block a user