From: Ekaterina Vaartis <vaartis@kotobank.ch>
Date: Sat, 22 Jan 2022 13:31:32 +0000 (+0300)
Subject: Fix meilisearch tests and jobs for oban
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7aebff799b57d27d97f7830fd7c3ef27875c33fe;p=akkoma

Fix meilisearch tests and jobs for oban
---

diff --git a/lib/pleroma/workers/search_indexing_worker.ex b/lib/pleroma/workers/search_indexing_worker.ex
index 43b7bad1e..70a8d42d0 100644
--- a/lib/pleroma/workers/search_indexing_worker.ex
+++ b/lib/pleroma/workers/search_indexing_worker.ex
@@ -9,6 +9,8 @@ defmodule Pleroma.Workers.SearchIndexingWorker do
     search_module = Pleroma.Config.get([Pleroma.Search, :module])
 
     search_module.add_to_index(activity)
+
+    :ok
   end
 
   def perform(%Job{args: %{"op" => "remove_from_index", "object" => object_id}}) do
@@ -17,5 +19,7 @@ defmodule Pleroma.Workers.SearchIndexingWorker do
     search_module = Pleroma.Config.get([Pleroma.Search, :module])
 
     search_module.remove_from_index(object)
+
+    :ok
   end
 end
diff --git a/test/pleroma/search/meilisearch_test.exs b/test/pleroma/search/meilisearch_test.exs
index 251388ea2..da614577f 100644
--- a/test/pleroma/search/meilisearch_test.exs
+++ b/test/pleroma/search/meilisearch_test.exs
@@ -6,6 +6,7 @@ defmodule Pleroma.Search.MeilisearchTest do
   require Pleroma.Constants
 
   use Pleroma.DataCase
+  use Oban.Testing, repo: Pleroma.Repo
 
   import Pleroma.Factory
   import Tesla.Mock
@@ -13,6 +14,7 @@ defmodule Pleroma.Search.MeilisearchTest do
 
   alias Pleroma.Search.Meilisearch
   alias Pleroma.Web.CommonAPI
+  alias Pleroma.Workers.SearchIndexingWorker
 
   setup_all do
     Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
@@ -27,7 +29,8 @@ defmodule Pleroma.Search.MeilisearchTest do
         {Meilisearch, [:passthrough],
          [
            add_to_index: fn a -> passthrough([a]) end,
-           remove_from_index: fn a -> passthrough([a]) end
+           remove_from_index: fn a -> passthrough([a]) end,
+           meili_put: fn u, a -> passthrough([u, a]) end
          ]}
       ],
       context,
@@ -38,7 +41,7 @@ defmodule Pleroma.Search.MeilisearchTest do
       user = insert(:user)
 
       mock_global(fn
-        %{method: :post, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
+        %{method: :put, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
           assert match?(
                    [%{"content" => "guys i just don&#39;t wanna leave the swamp"}],
                    Jason.decode!(body)
@@ -53,6 +56,15 @@ defmodule Pleroma.Search.MeilisearchTest do
           visibility: "public"
         })
 
+      args = %{"op" => "add_to_index", "activity" => activity.id}
+
+      assert_enqueued(
+        worker: SearchIndexingWorker,
+        args: args
+      )
+
+      assert :ok = perform_job(SearchIndexingWorker, args)
+
       assert_called(Meilisearch.add_to_index(activity))
     end
 
@@ -60,26 +72,25 @@ defmodule Pleroma.Search.MeilisearchTest do
       user = insert(:user)
 
       Enum.each(["unlisted", "private", "direct"], fn visiblity ->
-        {:ok, _} =
+        {:ok, activity} =
           CommonAPI.post(user, %{
             status: "guys i just don't wanna leave the swamp",
             visibility: visiblity
           })
+
+        Meilisearch.add_to_index(activity)
+        assert_not_called(Meilisearch.meili_put(:_))
       end)
 
       history = call_history(Meilisearch)
       assert Enum.count(history) == 3
-
-      Enum.each(history, fn {_, _, return} ->
-        assert is_nil(return)
-      end)
     end
 
     test "deletes posts from index when deleted locally" do
       user = insert(:user)
 
       mock_global(fn
-        %{method: :post, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
+        %{method: :put, url: "http://127.0.0.1:7700/indexes/objects/documents", body: body} ->
           assert match?(
                    [%{"content" => "guys i just don&#39;t wanna leave the swamp"}],
                    Jason.decode!(body)
@@ -98,10 +109,16 @@ defmodule Pleroma.Search.MeilisearchTest do
           visibility: "public"
         })
 
-      assert_called(Meilisearch.add_to_index(activity))
+      args = %{"op" => "add_to_index", "activity" => activity.id}
+      assert_enqueued(worker: SearchIndexingWorker, args: args)
+      assert :ok = perform_job(SearchIndexingWorker, args)
 
       {:ok, _} = CommonAPI.delete(activity.id, user)
 
+      delete_args = %{"op" => "remove_from_index", "object" => activity.object.id}
+      assert_enqueued(worker: SearchIndexingWorker, args: delete_args)
+      assert :ok = perform_job(SearchIndexingWorker, delete_args)
+
       assert_called(Meilisearch.remove_from_index(:_))
     end
   end