summaryrefslogtreecommitdiff
path: root/test/user_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-01-01 14:19:55 +0100
committerlain <lain@soykaf.club>2019-01-01 14:19:55 +0100
commit096a92780541e76229400ad9ee5b990b5e1b4d1f (patch)
treeac8a34ef7b89c7fe7bb5d97ee9994889a7667414 /test/user_test.exs
parent91afbbe4ea76a8af0072682d26a921aab9f64671 (diff)
parent90e157ef803296989b41d1fbfb5096b39320f75d (diff)
downloadpleroma-096a92780541e76229400ad9ee5b990b5e1b4d1f.tar.gz
pleroma-096a92780541e76229400ad9ee5b990b5e1b4d1f.zip
Merge remote-tracking branch 'origin/develop' into pool-usage
Diffstat (limited to 'test/user_test.exs')
-rw-r--r--test/user_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/user_test.exs b/test/user_test.exs
index 4680850ea..869e9196d 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -706,10 +706,10 @@ defmodule Pleroma.UserTest do
end
describe "per-user rich-text filtering" do
- test "html_filter_policy returns nil when rich-text is enabled" do
+ test "html_filter_policy returns default policies, when rich-text is enabled" do
user = insert(:user)
- assert nil == User.html_filter_policy(user)
+ assert Pleroma.Config.get([:markup, :scrub_policy]) == User.html_filter_policy(user)
end
test "html_filter_policy returns TwitterText scrubber when rich-text is disabled" do