Fix lazy tests

4 files changed, 34 insertions, 14 deletions

diff --git a/test/pleroma/activity_test.exs b/test/pleroma/activity_test.exs
index 4f9144f91..7d0e427fa 100644
--- a/test/pleroma/activity_test.exs
+++ b/test/pleroma/activity_test.exs
@@ -51,7 +51,8 @@ defmodule Pleroma.ActivityTest do
     {:ok, bookmark3} = Bookmark.create(user3.id, activity.id)
 
     queried_activity =
-      Ecto.Query.from(Pleroma.Activity)
+      Activity
+      |> Ecto.Query.where(id: ^activity.id)
       |> Activity.with_preloaded_bookmark(user3)
       |> Repo.one()
 
@@ -64,17 +65,19 @@ defmodule Pleroma.ActivityTest do
     annoyed_user = insert(:user)
     {:ok, _} = ThreadMute.add_mute(annoyed_user.id, activity.data["context"])
 
+    query = Ecto.Query.where(Activity, id: ^activity.id)
+
     activity_with_unset_thread_muted_field =
-      Ecto.Query.from(Activity)
+      query
       |> Repo.one()
 
     activity_for_user =
-      Ecto.Query.from(Activity)
+      query
       |> Activity.with_set_thread_muted_field(user)
       |> Repo.one()
 
     activity_for_annoyed_user =
-      Ecto.Query.from(Activity)
+      query
       |> Activity.with_set_thread_muted_field(annoyed_user)
       |> Repo.one()
 
@@ -90,7 +93,7 @@ defmodule Pleroma.ActivityTest do
       {:ok, bookmark} = Bookmark.create(user.id, activity.id)
 
       queried_activity =
-        Ecto.Query.from(Pleroma.Activity)
+        Ecto.Query.where(Activity, id: ^activity.id)
         |> Activity.with_preloaded_bookmark(user)
         |> Repo.one()
 
@@ -103,7 +106,7 @@ defmodule Pleroma.ActivityTest do
       {:ok, bookmark} = Bookmark.create(user.id, activity.id)
 
       queried_activity =
-        Ecto.Query.from(Pleroma.Activity)
+        Ecto.Query.where(Activity, id: ^activity.id)
         |> Repo.one()
 
       assert Activity.get_bookmark(queried_activity, user) == bookmark
@@ -266,7 +269,11 @@ defmodule Pleroma.ActivityTest do
     insert(:add_activity, user: user, note: note)
     insert(:add_activity, user: user)
 
-    assert Repo.aggregate(Activity, :count, :id) == 4
+    activities_query =
+      Activity
+      |> Ecto.Query.where(fragment("data->>'type' IN ('Create', 'Add')"))
+
+    assert Repo.aggregate(activities_query, :count, :id) == 4
 
     add_query =
       Activity.add_by_params_query(note.data["object"], user.ap_id, user.featured_address)
@@ -276,6 +283,6 @@ defmodule Pleroma.ActivityTest do
     Repo.delete_all(add_query)
     assert Repo.aggregate(add_query, :count, :id) == 0
 
-    assert Repo.aggregate(Activity, :count, :id) == 2
+    assert Repo.aggregate(activities_query, :count, :id) == 2
   end
 end
diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs
index 12d5d5db6..1d4d60c02 100644
--- a/test/pleroma/user_test.exs
+++ b/test/pleroma/user_test.exs
@@ -19,6 +19,8 @@ defmodule Pleroma.UserTest do
   import ExUnit.CaptureLog
   import Swoosh.TestAssertions
 
+  require Ecto.Query
+
   setup_all do
     Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
     :ok
@@ -436,7 +438,11 @@ defmodule Pleroma.UserTest do
       {:ok, registered_user} = User.register(cng)
       ObanHelpers.perform_all()
 
-      activity = Repo.one(Pleroma.Activity)
+      activity =
+        Activity
+        |> Ecto.Query.where(fragment("data->>'type' = 'Create'"))
+        |> Repo.one()
+
       assert registered_user.ap_id in activity.recipients
       assert Object.normalize(activity, fetch: false).data["content"] =~ "direct message"
       assert activity.actor == welcome_user.ap_id
@@ -452,7 +458,11 @@ defmodule Pleroma.UserTest do
       {:ok, registered_user} = User.register(cng)
       ObanHelpers.perform_all()
 
-      activity = Repo.one(Pleroma.Activity)
+      activity =
+        Activity
+        |> Ecto.Query.where(fragment("data->>'type' = 'Create'"))
+        |> Repo.one()
+
       assert registered_user.ap_id in activity.recipients
       assert Object.normalize(activity, fetch: false).data["content"] =~ "chat message"
       assert activity.actor == welcome_user.ap_id
@@ -491,7 +501,11 @@ defmodule Pleroma.UserTest do
       {:ok, registered_user} = User.register(cng)
       ObanHelpers.perform_all()
 
-      activity = Repo.one(Pleroma.Activity)
+      activity =
+        Activity
+        |> Ecto.Query.where(fragment("data->>'type' = 'Create'"))
+        |> Repo.one()
+
       assert registered_user.ap_id in activity.recipients
       assert Object.normalize(activity, fetch: false).data["content"] =~ "chat message"
       assert activity.actor == welcome_user.ap_id
diff --git a/test/pleroma/web/activity_pub/activity_pub_test.exs b/test/pleroma/web/activity_pub/activity_pub_test.exs
index 574ef0d71..c7934f496 100644
--- a/test/pleroma/web/activity_pub/activity_pub_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_test.exs
@@ -1514,8 +1514,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
                  content: content
                })
 
-      assert Repo.aggregate(Activity, :count, :id) == 1
-      assert Repo.aggregate(Object, :count, :id) == 2
+      assert Repo.aggregate(Object, :count, :id) == 3
       assert Repo.aggregate(Notification, :count, :id) == 0
     end
   end
diff --git a/test/pleroma/web/admin_api/controllers/report_controller_test.exs b/test/pleroma/web/admin_api/controllers/report_controller_test.exs
index 99cc7bbd0..e480a0118 100644
--- a/test/pleroma/web/admin_api/controllers/report_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/report_controller_test.exs
@@ -363,7 +363,7 @@ defmodule Pleroma.Web.AdminAPI.ReportControllerTest do
       [note, _] = notes
 
       assert note["user"]["nickname"] == admin.nickname
-      assert note["content"] == "this is disgusting!"
+      assert note["content"] =~ "this is disgusting"
       assert note["created_at"]
       assert response["total"] == 1
     end