projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
search_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
index 04dc6f4458cf86156090b9c95f25d47e50ffc850..1dd0fa3b8392c6518947ab83060c53b68d7e01cc 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
@@
-279,6
+279,10
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
end
test "search fetches remote statuses and prefers them over other results", %{conn: conn} do
end
test "search fetches remote statuses and prefers them over other results", %{conn: conn} do
+ old_version = :persistent_term.get({Pleroma.Repo, :postgres_version})
+ :persistent_term.put({Pleroma.Repo, :postgres_version}, 10.0)
+ on_exit(fn -> :persistent_term.put({Pleroma.Repo, :postgres_version}, old_version) end)
+
capture_log(fn ->
{:ok, %{id: activity_id}} =
CommonAPI.post(insert(:user), %{
capture_log(fn ->
{:ok, %{id: activity_id}} =
CommonAPI.post(insert(:user), %{
@@
-305,7
+309,7
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
})
capture_log(fn ->
})
capture_log(fn ->
- q = Object.normalize(activity).data["id"]
+ q = Object.normalize(activity
, fetch: false
).data["id"]
results =
conn
results =
conn