Merge branch 'revert-a54aa5af' into 'develop'

Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"

Closes #1488

See merge request pleroma/pleroma!2083

2 files changed, 1 insertions, 62 deletions

diff --git a/test/stats_test.exs b/test/stats_test.exs
deleted file mode 100644
index 02a92dc64..000000000
--- a/test/stats_test.exs
+++ /dev/null
@@ -1,53 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.StatsTest do
-  use Pleroma.DataCase
-
-  import Pleroma.Factory
-
-  alias Pleroma.Web.CommonAPI
-
-  describe "statuses count" do
-    setup do
-      user = insert(:user)
-      other_user = insert(:user)
-
-      CommonAPI.post(user, %{"visibility" => "public", "status" => "hey"})
-
-      Enum.each(0..1, fn _ ->
-        CommonAPI.post(user, %{
-          "visibility" => "unlisted",
-          "status" => "hey"
-        })
-      end)
-
-      Enum.each(0..2, fn _ ->
-        CommonAPI.post(user, %{
-          "visibility" => "direct",
-          "status" => "hey @#{other_user.nickname}"
-        })
-      end)
-
-      Enum.each(0..3, fn _ ->
-        CommonAPI.post(user, %{
-          "visibility" => "private",
-          "status" => "hey"
-        })
-      end)
-
-      :ok
-    end
-
-    test "it returns total number of statuses" do
-      data = Pleroma.Stats.get_stat_data()
-
-      assert data.stats.status_count.all == 10
-      assert data.stats.status_count.public == 1
-      assert data.stats.status_count.unlisted == 2
-      assert data.stats.status_count.direct == 3
-      assert data.stats.status_count.private == 4
-    end
-  end
-end
diff --git a/test/web/mastodon_api/controllers/instance_controller_test.exs b/test/web/mastodon_api/controllers/instance_controller_test.exs
index 7aa7c8648..e00de6b18 100644
--- a/test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/web/mastodon_api/controllers/instance_controller_test.exs
@@ -58,15 +58,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
 
     assert stats
     assert stats["user_count"] == 1
-
-    assert stats["status_count"] == %{
-             "all" => 1,
-             "direct" => 0,
-             "private" => 0,
-             "public" => 1,
-             "unlisted" => 0
-           }
-
+    assert stats["status_count"] == 1
     assert stats["domain_count"] == 2
   end