From: lain <lain@soykaf.club>
Date: Wed, 13 May 2020 09:34:30 +0000 (+0000)
Subject: Merge branch 'openapi/statuses' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=156c8a508846bd6d4e55f666c4ecc6f0129ac5fc;p=akkoma

Merge branch 'openapi/statuses' into 'develop'

Add OpenAPI spec for StatusController

See merge request pleroma/pleroma!2521
---

156c8a508846bd6d4e55f666c4ecc6f0129ac5fc
diff --cc test/web/mastodon_api/controllers/timeline_controller_test.exs
index 5e0d92f28,6d8f81b75..f8b9289f3
--- a/test/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs
@@@ -108,18 -108,16 +108,16 @@@ defmodule Pleroma.Web.MastodonAPI.Timel
      end
  
      test "the home timeline when the direct messages are excluded", %{user: user, conn: conn} do
-       {:ok, public_activity} = CommonAPI.post(user, %{"status" => ".", "visibility" => "public"})
-       {:ok, direct_activity} = CommonAPI.post(user, %{"status" => ".", "visibility" => "direct"})
+       {:ok, public_activity} = CommonAPI.post(user, %{status: ".", visibility: "public"})
+       {:ok, direct_activity} = CommonAPI.post(user, %{status: ".", visibility: "direct"})
  
-       {:ok, unlisted_activity} =
-         CommonAPI.post(user, %{"status" => ".", "visibility" => "unlisted"})
+       {:ok, unlisted_activity} = CommonAPI.post(user, %{status: ".", visibility: "unlisted"})
  
-       {:ok, private_activity} =
-         CommonAPI.post(user, %{"status" => ".", "visibility" => "private"})
+       {:ok, private_activity} = CommonAPI.post(user, %{status: ".", visibility: "private"})
  
 -      conn = get(conn, "/api/v1/timelines/home", %{"exclude_visibilities" => ["direct"]})
 +      conn = get(conn, "/api/v1/timelines/home?exclude_visibilities[]=direct")
  
 -      assert status_ids = json_response(conn, :ok) |> Enum.map(& &1["id"])
 +      assert status_ids = json_response_and_validate_schema(conn, :ok) |> Enum.map(& &1["id"])
        assert public_activity.id in status_ids
        assert unlisted_activity.id in status_ids
        assert private_activity.id in status_ids
@@@ -152,13 -150,13 +150,13 @@@
      test "the public timeline includes only public statuses for an authenticated user" do
        %{user: user, conn: conn} = oauth_access(["read:statuses"])
  
-       {:ok, _activity} = CommonAPI.post(user, %{"status" => "test"})
-       {:ok, _activity} = CommonAPI.post(user, %{"status" => "test", "visibility" => "private"})
-       {:ok, _activity} = CommonAPI.post(user, %{"status" => "test", "visibility" => "unlisted"})
-       {:ok, _activity} = CommonAPI.post(user, %{"status" => "test", "visibility" => "direct"})
+       {:ok, _activity} = CommonAPI.post(user, %{status: "test"})
+       {:ok, _activity} = CommonAPI.post(user, %{status: "test", visibility: "private"})
+       {:ok, _activity} = CommonAPI.post(user, %{status: "test", visibility: "unlisted"})
+       {:ok, _activity} = CommonAPI.post(user, %{status: "test", visibility: "direct"})
  
        res_conn = get(conn, "/api/v1/timelines/public")
 -      assert length(json_response(res_conn, 200)) == 1
 +      assert length(json_response_and_validate_schema(res_conn, 200)) == 1
      end
    end
  
@@@ -417,13 -414,13 +415,13 @@@
      test "multi-hashtag timeline", %{conn: conn} do
        user = insert(:user)
  
-       {:ok, activity_test} = CommonAPI.post(user, %{"status" => "#test"})
-       {:ok, activity_test1} = CommonAPI.post(user, %{"status" => "#test #test1"})
-       {:ok, activity_none} = CommonAPI.post(user, %{"status" => "#test #none"})
+       {:ok, activity_test} = CommonAPI.post(user, %{status: "#test"})
+       {:ok, activity_test1} = CommonAPI.post(user, %{status: "#test #test1"})
+       {:ok, activity_none} = CommonAPI.post(user, %{status: "#test #none"})
  
 -      any_test = get(conn, "/api/v1/timelines/tag/test", %{"any" => ["test1"]})
 +      any_test = get(conn, "/api/v1/timelines/tag/test?any[]=test1")
  
 -      [status_none, status_test1, status_test] = json_response(any_test, :ok)
 +      [status_none, status_test1, status_test] = json_response_and_validate_schema(any_test, :ok)
  
        assert to_string(activity_test.id) == status_test["id"]
        assert to_string(activity_test1.id) == status_test1["id"]