From 91d5a7e81c3161f80bb70cd9e1e7a7c8bc70c0b1 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Mon, 31 Dec 2018 00:03:03 +0300 Subject: Fix test failure --- test/user_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/user_test.exs b/test/user_test.exs index 4680850ea..ef652daf7 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -709,7 +709,7 @@ defmodule Pleroma.UserTest do test "html_filter_policy returns nil when rich-text is enabled" do user = insert(:user) - assert nil == User.html_filter_policy(user) + assert [Pleroma.HTML.Transform.MediaProxy, Pleroma.HTML.Scrubber.Default] == User.html_filter_policy(user) end test "html_filter_policy returns TwitterText scrubber when rich-text is disabled" do -- cgit v1.2.3 From 05743e2000a5837365ab2393732b9a9468d738d7 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Mon, 31 Dec 2018 00:12:14 +0300 Subject: Get default scrubbers from config instead of hardcoded --- test/user_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/user_test.exs b/test/user_test.exs index ef652daf7..bd40d7f85 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -709,7 +709,7 @@ defmodule Pleroma.UserTest do test "html_filter_policy returns nil when rich-text is enabled" do user = insert(:user) - assert [Pleroma.HTML.Transform.MediaProxy, Pleroma.HTML.Scrubber.Default] == 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 -- cgit v1.2.3 From 9f5881cbb1957a286d9b191e3d5be7f06b5a2941 Mon Sep 17 00:00:00 2001 From: Rin Toshaka Date: Mon, 31 Dec 2018 08:34:14 +0100 Subject: Fix a typo in user_test.ex --- test/user_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/user_test.exs b/test/user_test.exs index bd40d7f85..869e9196d 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -706,7 +706,7 @@ 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 Pleroma.Config.get([:markup, :scrub_policy]) == User.html_filter_policy(user) -- cgit v1.2.3