Fix meilisearch tests and jobs for oban

This commit is contained in:
Ekaterina Vaartis 2022-01-22 16:31:32 +03:00 committed by FloatingGhost
parent 5def4a7d49
commit 7aebff799b
2 changed files with 30 additions and 9 deletions

View file

@ -9,6 +9,8 @@ defmodule Pleroma.Workers.SearchIndexingWorker do
search_module = Pleroma.Config.get([Pleroma.Search, :module]) search_module = Pleroma.Config.get([Pleroma.Search, :module])
search_module.add_to_index(activity) search_module.add_to_index(activity)
:ok
end end
def perform(%Job{args: %{"op" => "remove_from_index", "object" => object_id}}) do 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 = Pleroma.Config.get([Pleroma.Search, :module])
search_module.remove_from_index(object) search_module.remove_from_index(object)
:ok
end end
end end

View file

@ -6,6 +6,7 @@ defmodule Pleroma.Search.MeilisearchTest do
require Pleroma.Constants require Pleroma.Constants
use Pleroma.DataCase use Pleroma.DataCase
use Oban.Testing, repo: Pleroma.Repo
import Pleroma.Factory import Pleroma.Factory
import Tesla.Mock import Tesla.Mock
@ -13,6 +14,7 @@ defmodule Pleroma.Search.MeilisearchTest do
alias Pleroma.Search.Meilisearch alias Pleroma.Search.Meilisearch
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Workers.SearchIndexingWorker
setup_all do setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
@ -27,7 +29,8 @@ defmodule Pleroma.Search.MeilisearchTest do
{Meilisearch, [:passthrough], {Meilisearch, [:passthrough],
[ [
add_to_index: fn a -> passthrough([a]) end, 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, context,
@ -38,7 +41,7 @@ defmodule Pleroma.Search.MeilisearchTest do
user = insert(:user) user = insert(:user)
mock_global(fn 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?( assert match?(
[%{"content" => "guys i just don't wanna leave the swamp"}], [%{"content" => "guys i just don't wanna leave the swamp"}],
Jason.decode!(body) Jason.decode!(body)
@ -53,6 +56,15 @@ defmodule Pleroma.Search.MeilisearchTest do
visibility: "public" 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)) assert_called(Meilisearch.add_to_index(activity))
end end
@ -60,26 +72,25 @@ defmodule Pleroma.Search.MeilisearchTest do
user = insert(:user) user = insert(:user)
Enum.each(["unlisted", "private", "direct"], fn visiblity -> Enum.each(["unlisted", "private", "direct"], fn visiblity ->
{:ok, _} = {:ok, activity} =
CommonAPI.post(user, %{ CommonAPI.post(user, %{
status: "guys i just don't wanna leave the swamp", status: "guys i just don't wanna leave the swamp",
visibility: visiblity visibility: visiblity
}) })
Meilisearch.add_to_index(activity)
assert_not_called(Meilisearch.meili_put(:_))
end) end)
history = call_history(Meilisearch) history = call_history(Meilisearch)
assert Enum.count(history) == 3 assert Enum.count(history) == 3
Enum.each(history, fn {_, _, return} ->
assert is_nil(return)
end)
end end
test "deletes posts from index when deleted locally" do test "deletes posts from index when deleted locally" do
user = insert(:user) user = insert(:user)
mock_global(fn 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?( assert match?(
[%{"content" => "guys i just don't wanna leave the swamp"}], [%{"content" => "guys i just don't wanna leave the swamp"}],
Jason.decode!(body) Jason.decode!(body)
@ -98,10 +109,16 @@ defmodule Pleroma.Search.MeilisearchTest do
visibility: "public" 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) {: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(:_)) assert_called(Meilisearch.remove_from_index(:_))
end end
end end