aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-09-08 14:52:33 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-09-08 14:52:33 +0000
commit9e49f4627fd0346cf88d44c4ab8c46c740aab36e (patch)
tree7d273045de8ad3acb867503ec6728807083d6d70 /test
parent0a05670b4499d170f6bc0eaecfae0d71be022227 (diff)
parentf6723dc9bd4f05319835158be9937dda4400feb9 (diff)
downloadpleroma-9e49f4627fd0346cf88d44c4ab8c46c740aab36e.tar.gz
Merge branch 'bugfix/favicon-empty-test' into 'develop'
Bugfix/favicon empty test See merge request pleroma/pleroma!2972
Diffstat (limited to 'test')
-rw-r--r--test/web/instances/instance_test.exs2
-rw-r--r--test/web/mastodon_api/views/account_view_test.exs3
2 files changed, 0 insertions, 5 deletions
diff --git a/test/web/instances/instance_test.exs b/test/web/instances/instance_test.exs
index 5d4efcebe..dc6ace843 100644
--- a/test/web/instances/instance_test.exs
+++ b/test/web/instances/instance_test.exs
@@ -112,8 +112,6 @@ defmodule Pleroma.Instances.InstanceTest do
end
test "Returns nil on too long favicon URLs" do
- clear_config([:instances_favicons, :enabled], true)
-
long_favicon_url =
"https://Lorem.ipsum.dolor.sit.amet/consecteturadipiscingelit/Praesentpharetrapurusutaliquamtempus/Mauriseulaoreetarcu/atfacilisisorci/Nullamporttitor/nequesedfeugiatmollis/dolormagnaefficiturlorem/nonpretiumsapienorcieurisus/Nullamveleratsem/Maecenassedaccumsanexnam/favicon.png"
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs
index 68a5d0091..9f22f9dcf 100644
--- a/test/web/mastodon_api/views/account_view_test.exs
+++ b/test/web/mastodon_api/views/account_view_test.exs
@@ -116,9 +116,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
end
end
- test "Favicon when :instance_favicons is enabled" do
- end
-
test "Represent the user account for the account owner" do
user = insert(:user)