From 83ae45b000261d3e03a4b554064350a5ead172c3 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 12 Oct 2020 18:49:37 -0500
Subject: Preload `/api/pleroma/frontend_configurations`, fixes #1932

---
 test/web/preload/instance_test.exs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'test/web/preload/instance_test.exs')

diff --git a/test/web/preload/instance_test.exs b/test/web/preload/instance_test.exs
index a46f28312..8493f2a94 100644
--- a/test/web/preload/instance_test.exs
+++ b/test/web/preload/instance_test.exs
@@ -45,4 +45,12 @@ defmodule Pleroma.Web.Preload.Providers.InstanceTest do
     assert metadata.private == false
     assert metadata.suggestions == %{enabled: false}
   end
+
+  test "it renders the frontend configurations", %{
+    "/api/pleroma/frontend_configurations" => fe_configs
+  } do
+    assert %{
+             pleroma_fe: %{background: "/images/city.jpg", logo: "/static/logo.png"}
+           } = fe_configs
+  end
 end
-- 
cgit v1.2.3


From 207211a2b36f2ce119cded088a0795b26f707621 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Fri, 26 Jun 2020 08:38:22 +0300
Subject: update files consistency after rebase

---
 test/web/preload/instance_test.exs | 56 --------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 test/web/preload/instance_test.exs

(limited to 'test/web/preload/instance_test.exs')

diff --git a/test/web/preload/instance_test.exs b/test/web/preload/instance_test.exs
deleted file mode 100644
index 8493f2a94..000000000
--- a/test/web/preload/instance_test.exs
+++ /dev/null
@@ -1,56 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.Preload.Providers.InstanceTest do
-  use Pleroma.DataCase
-  alias Pleroma.Web.Preload.Providers.Instance
-
-  setup do: {:ok, Instance.generate_terms(nil)}
-
-  test "it renders the info", %{"/api/v1/instance" => info} do
-    assert %{
-             description: description,
-             email: "admin@example.com",
-             registrations: true
-           } = info
-
-    assert String.equivalent?(description, "Pleroma: An efficient and flexible fediverse server")
-  end
-
-  test "it renders the panel", %{"/instance/panel.html" => panel} do
-    assert String.contains?(
-             panel,
-             "<p>Welcome to <a href=\"https://pleroma.social\" target=\"_blank\">Pleroma!</a></p>"
-           )
-  end
-
-  test "it works with overrides" do
-    clear_config([:instance, :static_dir], "test/fixtures/preload_static")
-
-    %{"/instance/panel.html" => panel} = Instance.generate_terms(nil)
-
-    assert String.contains?(
-             panel,
-             "HEY!"
-           )
-  end
-
-  test "it renders the node_info", %{"/nodeinfo/2.0.json" => nodeinfo} do
-    %{
-      metadata: metadata,
-      version: "2.0"
-    } = nodeinfo
-
-    assert metadata.private == false
-    assert metadata.suggestions == %{enabled: false}
-  end
-
-  test "it renders the frontend configurations", %{
-    "/api/pleroma/frontend_configurations" => fe_configs
-  } do
-    assert %{
-             pleroma_fe: %{background: "/images/city.jpg", logo: "/static/logo.png"}
-           } = fe_configs
-  end
-end
-- 
cgit v1.2.3