aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-04-17 11:37:21 +0200
committerRoger Braun <roger@rogerbraun.net>2017-04-17 11:37:21 +0200
commita185ea63af8ae00800763bd3ac0d3e6cf6548311 (patch)
tree34bea6a0a5be7bfd35eed9758d75c729af629a29 /test
parent6bfd521974ea30a044874dbc6dd6f422925d0055 (diff)
parent9a8f05e96dd42e820a849b98e0fa7bc019290207 (diff)
downloadpleroma-a185ea63af8ae00800763bd3ac0d3e6cf6548311.tar.gz
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
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