hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts merge request !2076
This commit is contained in:
Maxim Filippov 2019-12-21 11:41:19 +00:00
commit e71a13ad57
4 changed files with 6 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

53
test/stats_test.exs
View file

@ -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

10
test/web/mastodon_api/controllers/instance_controller_test.exs
View file

@ -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