Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 39 deletions

diff --git a/test/tasks/count_statuses_test.exs b/test/tasks/count_statuses_test.exs
deleted file mode 100644
index c5cd16960..000000000
--- a/test/tasks/count_statuses_test.exs
+++ /dev/null
@@ -1,39 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.CountStatusesTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.User
-  alias Pleroma.Web.CommonAPI
-
-  import ExUnit.CaptureIO, only: [capture_io: 1]
-  import Pleroma.Factory
-
-  test "counts statuses" do
-    user = insert(:user)
-    {:ok, _} = CommonAPI.post(user, %{status: "test"})
-    {:ok, _} = CommonAPI.post(user, %{status: "test2"})
-
-    user2 = insert(:user)
-    {:ok, _} = CommonAPI.post(user2, %{status: "test3"})
-
-    user = refresh_record(user)
-    user2 = refresh_record(user2)
-
-    assert %{note_count: 2} = user
-    assert %{note_count: 1} = user2
-
-    {:ok, user} = User.update_note_count(user, 0)
-    {:ok, user2} = User.update_note_count(user2, 0)
-
-    assert %{note_count: 0} = user
-    assert %{note_count: 0} = user2
-
-    assert capture_io(fn -> Mix.Tasks.Pleroma.CountStatuses.run([]) end) == "Done\n"
-
-    assert %{note_count: 2} = refresh_record(user)
-    assert %{note_count: 1} = refresh_record(user2)
-  end
-end