summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_controller_test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2019-02-03 18:19:40 +0000
committerlambda <pleromagit@rogerbraun.net>2019-02-03 18:19:40 +0000
commit69a38644bc20f49390717f06be30cc2874f7b6f7 (patch)
tree68db3940ef91d35e1dc83f175716f126e15db716 /test/web/mastodon_api/mastodon_api_controller_test.exs
parent8180de951e2ac1efc6cfb9f64d078d6a1b7d0c0e (diff)
parente61f0be9518aff867f4c56f5102723eddbcf40f1 (diff)
downloadpleroma-69a38644bc20f49390717f06be30cc2874f7b6f7.tar.gz
pleroma-69a38644bc20f49390717f06be30cc2874f7b6f7.zip
Merge branch '589-fix-cache' into 'develop'
Resolve "Update object cache on favs/boosts" Closes #589 See merge request pleroma/pleroma!764
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 141d300c7..8528d4f64 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -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