Unbreak all the tests.
This commit is contained in:
parent
505a084058
commit
e61f0be951
5 changed files with 10 additions and 0 deletions
|
@ -36,6 +36,7 @@ config :pbkdf2_elixir, rounds: 1
|
|||
config :pleroma, :websub, Pleroma.Web.WebsubMock
|
||||
config :pleroma, :ostatus, Pleroma.Web.OStatusMock
|
||||
config :tesla, adapter: Tesla.Mock
|
||||
config :pleroma, :rich_media, enabled: false
|
||||
|
||||
config :web_push_encryption, :vapid_details,
|
||||
subject: "mailto:administrator@example.com",
|
||||
|
|
|
@ -33,6 +33,7 @@ defmodule Pleroma.Web.ConnCase do
|
|||
|
||||
setup tags do
|
||||
Cachex.clear(:user_cache)
|
||||
Cachex.clear(:object_cache)
|
||||
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
|
||||
|
||||
unless tags[:async] do
|
||||
|
|
|
@ -32,6 +32,7 @@ defmodule Pleroma.DataCase do
|
|||
|
||||
setup tags do
|
||||
Cachex.clear(:user_cache)
|
||||
Cachex.clear(:object_cache)
|
||||
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
|
||||
|
||||
unless tags[:async] do
|
||||
|
|
|
@ -137,6 +137,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||
end
|
||||
|
||||
test "posting a status with OGP link preview", %{conn: conn} do
|
||||
Pleroma.Config.put([:rich_media, :enabled], true)
|
||||
user = insert(:user)
|
||||
|
||||
conn =
|
||||
|
@ -148,6 +149,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||
|
||||
assert %{"id" => id, "card" => %{"title" => "The Rock"}} = json_response(conn, 200)
|
||||
assert Repo.get(Activity, id)
|
||||
Pleroma.Config.put([:rich_media, :enabled], false)
|
||||
end
|
||||
|
||||
test "posting a direct status", %{conn: conn} do
|
||||
|
@ -1667,6 +1669,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||
end
|
||||
|
||||
test "Status rich-media Card", %{conn: conn, user: user} do
|
||||
Pleroma.Config.put([:rich_media, :enabled], true)
|
||||
{:ok, activity} = CommonAPI.post(user, %{"status" => "http://example.com/ogp"})
|
||||
|
||||
response =
|
||||
|
@ -1691,6 +1694,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
Pleroma.Config.put([:rich_media, :enabled], false)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -530,6 +530,8 @@ defmodule Pleroma.Web.OStatusTest do
|
|||
note_object.data
|
||||
|> Map.put("type", "Article")
|
||||
|
||||
Cachex.clear(:object_cache)
|
||||
|
||||
cs = Object.change(note_object, %{data: note_data})
|
||||
{:ok, _article_object} = Repo.update(cs)
|
||||
|
||||
|
|
Loading…
Reference in a new issue