aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambadalambda <gitgud@rogerbraun.net>2017-04-16 10:25:38 -0400
committerlambadalambda <gitgud@rogerbraun.net>2017-04-16 10:25:38 -0400
commit9a8f05e96dd42e820a849b98e0fa7bc019290207 (patch)
treeaa545ad989ae70367aff25e1dfe970f28e88e55a /test
parente158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff)
parent85bd480be333896ca9cc0ade0e68ea99e10aaaa7 (diff)
downloadpleroma-9a8f05e96dd42e820a849b98e0fa7bc019290207.tar.gz
Merge branch 'feature/help-test' into 'develop'
Add help/test resource See merge request !3
Diffstat (limited to 'test')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index f9723dd9f..6c48b5597 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -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