Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'oban/richmedia-stream' into 'develop'

Browse Source 
Add test validating the activity_id is correctly present in the Oban job

See merge request pleroma/pleroma!4159
This commit is contained in:
feld 2024-06-24 02:05:41 +00:00
commit a9bea02fe9
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
changelog.d/rich_media_oban.skip Normal file
View File

2
lib/pleroma/web/rich_media/card.ex
View File

@ -83,7 +83,7 @@ defmodule Pleroma.Web.RichMedia.Card do
card card
nil -> nil ->
activity_id = Keyword.get(opts, :activity, nil) activity_id = Keyword.get(opts, :activity_id, nil)
RichMediaWorker.new(%{"op" => "backfill", "url" => url, "activity_id" => activity_id}) RichMediaWorker.new(%{"op" => "backfill", "url" => url, "activity_id" => activity_id})
|> Oban.insert() |> Oban.insert()

7
test/pleroma/web/rich_media/card_test.exs
View File

@ -3,12 +3,14 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.CardTest do defmodule Pleroma.Web.RichMedia.CardTest do
use Oban.Testing, repo: Pleroma.Repo
use Pleroma.DataCase, async: true use Pleroma.DataCase, async: true
alias Pleroma.Tests.ObanHelpers alias Pleroma.Tests.ObanHelpers
alias Pleroma.UnstubbedConfigMock, as: ConfigMock alias Pleroma.UnstubbedConfigMock, as: ConfigMock
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.RichMedia.Card alias Pleroma.Web.RichMedia.Card
alias Pleroma.Workers.RichMediaWorker
import Mox import Mox
import Pleroma.Factory import Pleroma.Factory
@ -37,6 +39,11 @@ defmodule Pleroma.Web.RichMedia.CardTest do
content_type: "text/markdown" content_type: "text/markdown"
}) })
assert_enqueued(
worker: RichMediaWorker,
args: %{"url" => url, "activity_id" => activity.id}
)
ObanHelpers.perform_all() ObanHelpers.perform_all()
assert %Card{url_hash: ^url_hash, fields: _} = Card.get_by_activity(activity) assert %Card{url_hash: ^url_hash, fields: _} = Card.get_by_activity(activity)