summaryrefslogtreecommitdiff
path: root/test/web/common_api/common_api_test.exs
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
commit212c31c63796a21233e8decf7ce46853383286fd (patch)
tree0cc01fbf91ddb5037d67b39f0af80737aeec51ad /test/web/common_api/common_api_test.exs
parent64165d1df95bc3a22260dafa4584471427685864 (diff)
parent8eebc75c152ee339bac347350266e3bc6536016b (diff)
downloadpleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz
pleroma-212c31c63796a21233e8decf7ce46853383286fd.zip
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Diffstat (limited to 'test/web/common_api/common_api_test.exs')
-rw-r--r--test/web/common_api/common_api_test.exs6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index b80523160..0da0bd2e2 100644
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -17,9 +17,9 @@ defmodule Pleroma.Web.CommonAPITest do
require Pleroma.Constants
- clear_config([:instance, :safe_dm_mentions])
- clear_config([:instance, :limit])
- clear_config([:instance, :max_pinned_statuses])
+ setup do: clear_config([:instance, :safe_dm_mentions])
+ setup do: clear_config([:instance, :limit])
+ setup do: clear_config([:instance, :max_pinned_statuses])
test "when replying to a conversation / participation, it will set the correct context id even if no explicit reply_to is given" do
user = insert(:user)