From 5637d163e6eb365c69f0e79e43306156241f6494 Mon Sep 17 00:00:00 2001
From: Lain Iwakura <lain@soykaf.club>
Date: Thu, 30 Nov 2017 14:59:44 +0100
Subject: MastodonAPI: Add proper user count.

---
 test/web/mastodon_api/mastodon_api_controller_test.exs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'test')

diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index c8b929501..fc0010569 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -573,4 +573,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       assert user["header"] != "https://placehold.it/700x335"
     end
   end
+
+  test "get instance information" do
+    insert(:user, %{local: true})
+    user = insert(:user, %{local: true})
+    insert(:user, %{local: false})
+
+    {:ok, _} = TwitterAPI.create_status(user, %{"status" => "cofe"})
+
+    conn = conn
+    |> get("/api/v1/instance")
+
+    assert result = json_response(conn, 200)
+
+    assert result["stats"]["user_count"] == 2
+  end
 end
-- 
cgit v1.2.3


From d08a34e88b0d42f403755e1bdbaf015784ebbe74 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 3 Dec 2017 13:34:17 +0100
Subject: OStatus: Add user bio as summary field

Fixes problem with bio federation.
---
 test/web/ostatus/user_representer_test.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test')

diff --git a/test/web/ostatus/user_representer_test.exs b/test/web/ostatus/user_representer_test.exs
index a4afc2cf7..d5d70f5c6 100644
--- a/test/web/ostatus/user_representer_test.exs
+++ b/test/web/ostatus/user_representer_test.exs
@@ -18,6 +18,7 @@ defmodule Pleroma.Web.OStatus.UserRepresenterTest do
     <poco:preferredUsername>#{user.nickname}</poco:preferredUsername>
     <poco:displayName>#{user.name}</poco:displayName>
     <poco:note>#{user.bio}</poco:note>
+    <summary>#{user.bio}</summary>
     <name>#{user.nickname}</name>
     <link rel="avatar" href="#{User.avatar_url(user)}" />
     """
-- 
cgit v1.2.3


From e7c2472abd470b3b0ba8e9321a378e5a77412e26 Mon Sep 17 00:00:00 2001
From: Lain Iwakura <lain@soykaf.club>
Date: Tue, 5 Dec 2017 12:18:04 +0100
Subject: Fix tests.

---
 test/web/twitter_api/twitter_api_controller_test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index d12ade132..90d0fa654 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -22,7 +22,8 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
         |> with_credentials(user.nickname, "test")
         |> post("/api/account/verify_credentials.json")
 
-      assert json_response(conn, 200) == UserView.render("show.json", %{user: user})
+      assert response = json_response(conn, 200)
+      assert response == UserView.render("show.json", %{user: user, token: response["token"]})
     end
   end
 
-- 
cgit v1.2.3