pleroma

commit: 9e49f4627fd0346cf88d44c4ab8c46c740aab36e
parent: 0a05670b4499d170f6bc0eaecfae0d71be022227
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue,  8 Sep 2020 14:52:33 +0000

Merge branch 'bugfix/favicon-empty-test' into 'develop'

Bugfix/favicon empty test

See merge request pleroma/pleroma!2972
Diffstat:
M
config/test.exs
2
--
M
test/web/instances/instance_test.exs
2
--
M
test/web/mastodon_api/views/account_view_test.exs
3
---

3 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/config/test.exs b/config/test.exs
@@ -114,8 +114,6 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
-config :pleroma, :instances_favicons, enabled: false
-
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
   streaming_enabled: true,
diff --git 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
@@ -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)