aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-01-08 16:01:35 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-01-08 16:01:35 +0700
commit7b6c5f0a9d02785bee3e4c2585fea1f8983e61b0 (patch)
treed27762ebddcfcc371cc1735835b4982ff59c61cc
parentdb6f4496ebb5dbcb680104b2df80410b9dcb8407 (diff)
downloadpleroma-7b6c5f0a9d02785bee3e4c2585fea1f8983e61b0.tar.gz
improve test readability
-rw-r--r--test/web/activity_pub/activity_pub_test.exs6
-rw-r--r--test/web/common_api/common_api_test.exs2
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs4
3 files changed, 6 insertions, 6 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 325ef6636..e6c998876 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -610,14 +610,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
{:ok, activity_three} = CommonAPI.post(user, %{"status" => "HI!!!"})
CommonAPI.pin(activity_one.id, user)
+ user = refresh_record(user)
- user = User.get_by_ap_id(user.ap_id)
CommonAPI.pin(activity_two.id, user)
+ user = refresh_record(user)
- user = User.get_by_ap_id(user.ap_id)
CommonAPI.pin(activity_three.id, user)
+ user = refresh_record(user)
- user = User.get_by_ap_id(user.ap_id)
activities = ActivityPub.fetch_user_activities(user, nil, %{"pinned" => "true"})
assert 3 = length(activities)
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index 24e5e56f4..7d5ceb398 100644
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -116,7 +116,7 @@ defmodule Pleroma.Web.CommonAPI.Test do
assert {:ok, ^activity_one} = CommonAPI.pin(activity_one.id, user)
- user = User.get_by_ap_id(user.ap_id)
+ user = refresh_record(user)
assert {:error, "You have already pinned the maximum number of statuses"} =
CommonAPI.pin(activity_two.id, user)
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 4a8c70b3b..a3c58379e 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -1522,7 +1522,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
{:ok, _} = CommonAPI.pin(activity.id, user)
id_str = Integer.to_string(activity.id)
- user = User.get_by_ap_id(user.ap_id)
+ user = refresh_record(user)
assert %{"id" => ^id_str, "pinned" => false} =
conn
@@ -1556,7 +1556,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> Map.get(:resp_body)
|> Jason.decode!()
- user = User.get_by_ap_id(user.ap_id)
+ user = refresh_record(user)
assert %{"error" => "You have already pinned the maximum number of statuses"} =
conn