logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 253178538410c63be6bd14016b800b42df59bfb6
parent 351a306d462ae804ee9d0bbc9f8e7781caf34533
Author: Mark Felder <feld@feld.me>
Date:   Wed,  7 Aug 2024 13:07:54 -0400

Do not allow committing tests with a .ex extension

Diffstat:

M.gitignore3+++
Achangelog.d/text-extensions.skip0
Dtest/pleroma/web/views/streamer_view_test.ex100-------------------------------------------------------------------------------
Atest/pleroma/web/views/streamer_view_test.exs100+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 103 insertions(+), 100 deletions(-)

diff --git a/.gitignore b/.gitignore @@ -63,3 +63,6 @@ pleroma.iml 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 diff --git a/test/pleroma/web/views/streamer_view_test.ex b/test/pleroma/web/views/streamer_view_test.ex @@ -1,100 +0,0 @@ -# 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) - - 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) - - 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) - - 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 diff --git a/test/pleroma/web/views/streamer_view_test.exs b/test/pleroma/web/views/streamer_view_test.exs @@ -0,0 +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, 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, 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, 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