Page MenuHomePhorge
Files F85824580

No OneTemporary
Actions

Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.gitignore b/.gitignore
index c0d017951..355cea069 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,65 +1,68 @@
# App artifacts
/_build
/db
/deps
/*.ez
/test/instance
/test/uploads
/.elixir_ls
/test/fixtures/DSCN0010_tmp*
/test/fixtures/test_tmp.txt
/test/fixtures/image_tmp.jpg
/test/tmp/
/doc
/instance
/priv/ssh_keys
# Prevent committing custom emojis
/priv/static/emoji/custom/*
# Generated on crash by the VM
erl_crash.dump
# Files matching config/*.secret.exs pattern contain sensitive
# data and you should not commit them into version control.
#
# Alternatively, you may comment the line below and commit the
# secrets files as long as you replace their contents by environment
# variables.
/config/*.secret.exs
/config/generated_config.exs
/config/runtime.exs
/config/*.env
# Database setup file, some may forget to delete it
/config/setup_db*.psql
.DS_Store
.env
# Editor config
/.vscode/
# Prevent committing docs files
/priv/static/doc/*
docs/generated_config.md
# Code test coverage
/cover
/Elixir.*.coverdata
/coverage.xml
.idea
pleroma.iml
# asdf
.tool-versions
# Editor temp files
*~
*#
*.swp
archive-*
.gitlab-ci-local
+
+# Test files should be named *.exs
+test/pleroma/**/*.ex
diff --git a/changelog.d/text-extensions.skip b/changelog.d/text-extensions.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/pleroma/web/views/streamer_view_test.ex b/test/pleroma/web/views/streamer_view_test.exs
similarity index 94%
rename from test/pleroma/web/views/streamer_view_test.ex
rename to test/pleroma/web/views/streamer_view_test.exs
index 43a17a43e..b1c5f52ab 100644
--- a/test/pleroma/web/views/streamer_view_test.ex
+++ b/test/pleroma/web/views/streamer_view_test.exs
@@ -1,100 +1,100 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.StreamerViewTest do
use Pleroma.Web.ConnCase, async: true
# import ExUnit.CaptureLog
import Pleroma.Factory
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.StreamerView
describe "follow_relationships_update.json" do
test "shows follower/following count normally" do
other_user = insert(:user)
%{id: following_id} = following = insert(:user)
follower = insert(:user)
{:ok, _, _, _} = CommonAPI.follow(other_user, following)
- {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+ {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
result =
StreamerView.render(
"follow_relationships_update.json",
%{follower: follower, following: following, state: :test},
"user:test"
)
{:ok, %{"payload" => payload}} = Jason.decode(result)
{:ok, decoded_payload} = Jason.decode(payload)
# check the payload updating the user that was followed
assert match?(
%{"follower_count" => 1, "following_count" => 1, "id" => ^following_id},
decoded_payload["following"]
)
end
test "hides follower count for :hide_followers and :hide_followers_count" do
user_attrs = [%{hide_followers: true}, %{hide_followers_count: true}]
Enum.each(user_attrs, fn attrs ->
other_user = insert(:user)
%{id: following_id} = following = insert(:user, attrs)
follower = insert(:user)
{:ok, _, _, _} = CommonAPI.follow(other_user, following)
- {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+ {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
result =
StreamerView.render(
"follow_relationships_update.json",
%{follower: follower, following: following, state: :test},
"user:test"
)
{:ok, %{"payload" => payload}} = Jason.decode(result)
{:ok, decoded_payload} = Jason.decode(payload)
# check the payload updating the user that was followed
assert match?(
%{"follower_count" => 0, "following_count" => 1, "id" => ^following_id},
decoded_payload["following"]
)
end)
end
test "hides follows count for :hide_follows and :hide_follows_count" do
user_attrs = [%{hide_follows: true}, %{hide_follows_count: true}]
Enum.each(user_attrs, fn attrs ->
other_user = insert(:user)
%{id: following_id} = following = insert(:user, attrs)
follower = insert(:user)
{:ok, _, _, _} = CommonAPI.follow(other_user, following)
- {:ok, follower, following, _activity} = CommonAPI.follow(following, follower)
+ {:ok, following, follower, _activity} = CommonAPI.follow(following, follower)
result =
StreamerView.render(
"follow_relationships_update.json",
%{follower: follower, following: following, state: :test},
"user:test"
)
{:ok, %{"payload" => payload}} = Jason.decode(result)
{:ok, decoded_payload} = Jason.decode(payload)
# check the payload updating the user that was followed
assert match?(
%{"follower_count" => 1, "following_count" => 0, "id" => ^following_id},
decoded_payload["following"]
)
end)
end
end
end

File Metadata

Mime Type
text/x-diff
Expires
Thu, Oct 29, 4:43 PM (1 d, 13 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1798370
Default Alt Text
(5 KB)

Event Timeline