X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Fmastodon_api%2Fcontrollers%2Finstance_controller_test.exs;h=0d4eebb73d0a9e05631656339dcc5d537d76a795;hb=0b19534475284b902746be1ee02ed6f1be20a4fa;hp=6a9ccd97983c6f9dc50b2026b0a90045d0cb5007;hpb=755f58168bb2b6b979c6f5d36f7eff56d2305911;p=akkoma

diff --git a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
index 6a9ccd979..0d4eebb73 100644
--- a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
@@ -1,8 +1,9 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
+  # TODO: Should not need Cachex
   use Pleroma.Web.ConnCase
 
   alias Pleroma.User
@@ -13,6 +14,9 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
     assert result = json_response_and_validate_schema(conn, 200)
 
     email = Pleroma.Config.get([:instance, :email])
+    thumbnail = Pleroma.Web.base_url() <> Pleroma.Config.get([:instance, :instance_thumbnail])
+    background = Pleroma.Web.base_url() <> Pleroma.Config.get([:instance, :background_image])
+
     # Note: not checking for "max_toot_chars" since it's optional
     assert %{
              "uri" => _,
@@ -24,7 +28,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
                "streaming_api" => _
              },
              "stats" => _,
-             "thumbnail" => _,
+             "thumbnail" => from_config_thumbnail,
              "languages" => _,
              "registrations" => _,
              "approval_required" => _,
@@ -33,7 +37,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
              "avatar_upload_limit" => _,
              "background_upload_limit" => _,
              "banner_upload_limit" => _,
-             "background_image" => _,
+             "background_image" => from_config_background,
              "chat_limit" => _,
              "description_limit" => _
            } = result
@@ -45,13 +49,15 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
     assert result["pleroma"]["vapid_public_key"]
 
     assert email == from_config_email
+    assert thumbnail == from_config_thumbnail
+    assert background == from_config_background
   end
 
   test "get instance stats", %{conn: conn} do
     user = insert(:user, %{local: true})
 
     user2 = insert(:user, %{local: true})
-    {:ok, _user2} = User.deactivate(user2, !user2.deactivated)
+    {:ok, _user2} = User.set_activation(user2, false)
 
     insert(:user, %{local: false, nickname: "u@peer1.com"})
     insert(:user, %{local: false, nickname: "u@peer2.com"})