diff options
Diffstat (limited to 'test/web/mastodon_api/views')
| -rw-r--r-- | test/web/mastodon_api/views/account_view_test.exs | 48 | ||||
| -rw-r--r-- | test/web/mastodon_api/views/notification_view_test.exs | 8 | ||||
| -rw-r--r-- | test/web/mastodon_api/views/status_view_test.exs | 2 | 
3 files changed, 29 insertions, 29 deletions
| diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs index d965f76bf..62b2ab7e3 100644 --- a/test/web/mastodon_api/views/account_view_test.exs +++ b/test/web/mastodon_api/views/account_view_test.exs @@ -88,7 +88,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do        }      } -    assert expected == AccountView.render("account.json", %{user: user}) +    assert expected == AccountView.render("show.json", %{user: user})    end    test "Represent the user account for the account owner" do @@ -106,7 +106,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do      assert %{               pleroma: %{notification_settings: ^notification_settings},               source: %{privacy: ^privacy} -           } = AccountView.render("account.json", %{user: user, for: user}) +           } = AccountView.render("show.json", %{user: user, for: user})    end    test "Represent a Service(bot) account" do @@ -160,13 +160,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do        }      } -    assert expected == AccountView.render("account.json", %{user: user}) +    assert expected == AccountView.render("show.json", %{user: user})    end    test "Represent a deactivated user for an admin" do      admin = insert(:user, %{info: %{is_admin: true}})      deactivated_user = insert(:user, %{info: %{deactivated: true}}) -    represented = AccountView.render("account.json", %{user: deactivated_user, for: admin}) +    represented = AccountView.render("show.json", %{user: deactivated_user, for: admin})      assert represented[:pleroma][:deactivated] == true    end @@ -348,27 +348,27 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do        }      } -    assert expected == AccountView.render("account.json", %{user: user, for: other_user}) +    assert expected == AccountView.render("show.json", %{user: user, for: other_user})    end    test "returns the settings store if the requesting user is the represented user and it's requested specifically" do      user = insert(:user, %{info: %User.Info{pleroma_settings_store: %{fe: "test"}}})      result = -      AccountView.render("account.json", %{user: user, for: user, with_pleroma_settings: true}) +      AccountView.render("show.json", %{user: user, for: user, with_pleroma_settings: true})      assert result.pleroma.settings_store == %{:fe => "test"} -    result = AccountView.render("account.json", %{user: user, with_pleroma_settings: true}) +    result = AccountView.render("show.json", %{user: user, with_pleroma_settings: true})      assert result.pleroma[:settings_store] == nil -    result = AccountView.render("account.json", %{user: user, for: user}) +    result = AccountView.render("show.json", %{user: user, for: user})      assert result.pleroma[:settings_store] == nil    end    test "sanitizes display names" do      user = insert(:user, name: "<marquee> username </marquee>") -    result = AccountView.render("account.json", %{user: user}) +    result = AccountView.render("show.json", %{user: user})      refute result.display_name == "<marquee> username </marquee>"    end @@ -391,7 +391,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do                 followers_count: 0,                 following_count: 0,                 pleroma: %{hide_follows_count: true, hide_followers_count: true} -             } = AccountView.render("account.json", %{user: user}) +             } = AccountView.render("show.json", %{user: user})      end      test "shows when follows/followers are hidden" do @@ -404,7 +404,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do                 followers_count: 1,                 following_count: 1,                 pleroma: %{hide_follows: true, hide_followers: true} -             } = AccountView.render("account.json", %{user: user}) +             } = AccountView.render("show.json", %{user: user})      end      test "shows actual follower/following count to the account owner" do @@ -416,7 +416,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do        assert %{                 followers_count: 1,                 following_count: 1 -             } = AccountView.render("account.json", %{user: user, for: user}) +             } = AccountView.render("show.json", %{user: user, for: user})      end    end @@ -425,65 +425,65 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do        user = insert(:user)        assert %{follow_requests_count: 0} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})        other_user = insert(:user)        {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)        assert %{follow_requests_count: 0} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})      end      test "shows non-zero when follow requests are pending" do        user = insert(:user, %{info: %{locked: true}}) -      assert %{locked: true} = AccountView.render("account.json", %{user: user, for: user}) +      assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})        other_user = insert(:user)        {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)        assert %{locked: true, follow_requests_count: 1} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})      end      test "decreases when accepting a follow request" do        user = insert(:user, %{info: %{locked: true}}) -      assert %{locked: true} = AccountView.render("account.json", %{user: user, for: user}) +      assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})        other_user = insert(:user)        {:ok, other_user, user, _activity} = CommonAPI.follow(other_user, user)        assert %{locked: true, follow_requests_count: 1} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})        {:ok, _other_user} = CommonAPI.accept_follow_request(other_user, user)        assert %{locked: true, follow_requests_count: 0} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})      end      test "decreases when rejecting a follow request" do        user = insert(:user, %{info: %{locked: true}}) -      assert %{locked: true} = AccountView.render("account.json", %{user: user, for: user}) +      assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})        other_user = insert(:user)        {:ok, other_user, user, _activity} = CommonAPI.follow(other_user, user)        assert %{locked: true, follow_requests_count: 1} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})        {:ok, _other_user} = CommonAPI.reject_follow_request(other_user, user)        assert %{locked: true, follow_requests_count: 0} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})      end      test "shows non-zero when historical unapproved requests are present" do        user = insert(:user, %{info: %{locked: true}}) -      assert %{locked: true} = AccountView.render("account.json", %{user: user, for: user}) +      assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})        other_user = insert(:user)        {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user) @@ -491,7 +491,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do        {:ok, user} = User.update_info(user, &User.Info.user_upgrade(&1, %{locked: false}))        assert %{locked: false, follow_requests_count: 1} = -               AccountView.render("account.json", %{user: user, for: user}) +               AccountView.render("show.json", %{user: user, for: user})      end    end  end diff --git a/test/web/mastodon_api/views/notification_view_test.exs b/test/web/mastodon_api/views/notification_view_test.exs index 86268fcfa..81ab82e2b 100644 --- a/test/web/mastodon_api/views/notification_view_test.exs +++ b/test/web/mastodon_api/views/notification_view_test.exs @@ -27,7 +27,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do        id: to_string(notification.id),        pleroma: %{is_seen: false},        type: "mention", -      account: AccountView.render("account.json", %{user: user, for: mentioned_user}), +      account: AccountView.render("show.json", %{user: user, for: mentioned_user}),        status: StatusView.render("show.json", %{activity: activity, for: mentioned_user}),        created_at: Utils.to_masto_date(notification.inserted_at)      } @@ -50,7 +50,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do        id: to_string(notification.id),        pleroma: %{is_seen: false},        type: "favourite", -      account: AccountView.render("account.json", %{user: another_user, for: user}), +      account: AccountView.render("show.json", %{user: another_user, for: user}),        status: StatusView.render("show.json", %{activity: create_activity, for: user}),        created_at: Utils.to_masto_date(notification.inserted_at)      } @@ -72,7 +72,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do        id: to_string(notification.id),        pleroma: %{is_seen: false},        type: "reblog", -      account: AccountView.render("account.json", %{user: another_user, for: user}), +      account: AccountView.render("show.json", %{user: another_user, for: user}),        status: StatusView.render("show.json", %{activity: reblog_activity, for: user}),        created_at: Utils.to_masto_date(notification.inserted_at)      } @@ -92,7 +92,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do        id: to_string(notification.id),        pleroma: %{is_seen: false},        type: "follow", -      account: AccountView.render("account.json", %{user: follower, for: followed}), +      account: AccountView.render("show.json", %{user: follower, for: followed}),        created_at: Utils.to_masto_date(notification.inserted_at)      } diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs index 683132f8d..8df23d0a8 100644 --- a/test/web/mastodon_api/views/status_view_test.exs +++ b/test/web/mastodon_api/views/status_view_test.exs @@ -103,7 +103,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do        id: to_string(note.id),        uri: object_data["id"],        url: Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, note), -      account: AccountView.render("account.json", %{user: user}), +      account: AccountView.render("show.json", %{user: user}),        in_reply_to_id: nil,        in_reply_to_account_id: nil,        card: nil, | 
