X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fpleroma%2Fsearch%2Fmeilisearch_test.exs;h=fe09c948589d80f7a81131147a8aedf29fc46730;hb=df03d64dc529e73c0424625a2a75d350f1d29680;hp=6e13c8edf9e4e2084354dc297a452889785bc002;hpb=88891e9d764f43389a0b7daf6a39b6648e95d30d;p=akkoma

diff --git a/test/pleroma/search/meilisearch_test.exs b/test/pleroma/search/meilisearch_test.exs
index 6e13c8edf..fe09c9485 100644
--- a/test/pleroma/search/meilisearch_test.exs
+++ b/test/pleroma/search/meilisearch_test.exs
@@ -6,13 +6,15 @@ defmodule Pleroma.Search.MeilisearchTest do
   require Pleroma.Constants
 
   use Pleroma.DataCase
+  use Oban.Testing, repo: Pleroma.Repo
 
   import Pleroma.Factory
   import Tesla.Mock
   import Mock
 
-  alias Pleroma.Web.CommonAPI
   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,13 +41,13 @@ 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't wanna leave the swamp"}],
                    Jason.decode!(body)
                  )
 
-          json(%{updateId: 1})
+          json(%{taskUid: 1})
       end)
 
       {:ok, activity} =
@@ -53,43 +56,55 @@ 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
 
     test "doesn't index posts that are not public" do
       user = insert(:user)
 
-      Enum.each(["unlisted", "private", "direct"], fn visiblity ->
-        {:ok, _} =
+      Enum.each(["private", "direct"], fn visibility ->
+        {:ok, activity} =
           CommonAPI.post(user, %{
             status: "guys i just don't wanna leave the swamp",
-            visibility: visiblity
+            visibility: visibility
           })
-      end)
 
-      history = call_history(Meilisearch)
-      assert Enum.count(history) == 3
+        args = %{"op" => "add_to_index", "activity" => activity.id}
+
+        assert_enqueued(worker: SearchIndexingWorker, args: args)
+        assert :ok = perform_job(SearchIndexingWorker, args)
 
-      Enum.each(history, fn {_, _, return} ->
-        assert is_nil(return)
+        assert_not_called(Meilisearch.meili_put(:_))
       end)
+
+      history = call_history(Meilisearch)
+      assert Enum.count(history) == 2
     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't wanna leave the swamp"}],
                    Jason.decode!(body)
                  )
 
-          json(%{updateId: 1})
+          json(%{taskUid: 1})
 
         %{method: :delete, url: "http://127.0.0.1:7700/indexes/objects/documents/" <> id} ->
           assert String.length(id) > 1
-          json(%{updateId: 2})
+          json(%{taskUid: 2})
       end)
 
       {:ok, activity} =
@@ -98,10 +113,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