logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: c4c5caedd809e46542ae3632762d93f14890d51d
parent 1d0e130cb3f37f611ec8242d99c12f693e328112
Author: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date:   Sun, 16 Aug 2020 21:01:38 +0300

changes after rebase

Diffstat:

Rlib/pleroma/tesla/middleware/connection_pool.ex -> lib/pleroma/http/middleware/connection_pool.ex0
Rtest/gun/conneciton_pool_test.exs -> test/pleroma/gun/connection_pool_test.exs0
Rtest/migrations/20200716195806_autolinker_to_linkify_test.exs -> test/pleroma/repo/migrations/autolinker_to_linkify_test.exs0
Rtest/migrations/20200802170532_fix_legacy_tags_test.exs -> test/pleroma/repo/migrations/fix_legacy_tags_test.exs0
Rtest/migrations/20200722185515_fix_malformed_formatter_config_test.exs -> test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs0
Rtest/migrations/20200724133313_move_welcome_settings_test.exs -> test/pleroma/repo/migrations/move_welcome_settings_test.exs0
Rtest/report_note_test.exs -> test/pleroma/report_note_test.exs0
Rtest/user/welcome_chat_massage_test.exs -> test/pleroma/user/welcome_chat_message_test.exs0
Rtest/user/welcome_email_test.exs -> test/pleroma/user/welcome_email_test.exs0
Rtest/user/welcome_message_test.exs -> test/pleroma/user/welcome_message_test.exs0
Rtest/web/activity_pub/object_validators/accept_validation_test.exs -> test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs0
Rtest/web/activity_pub/object_validators/reject_validation_test.exs -> test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs0
Rtest/web/activity_pub/transmogrifier/accept_handling_test.exs -> test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs0
Rtest/web/activity_pub/transmogrifier/answer_handling_test.exs -> test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs0
Rtest/web/activity_pub/transmogrifier/question_handling_test.exs -> test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs0
Rtest/web/activity_pub/transmogrifier/reject_handling_test.exs -> test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs0
Atest/pleroma/web/plugs/frontend_static_plug_test.exs56++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dtest/plugs/frontend_static_test.exs57---------------------------------------------------------
18 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/lib/pleroma/tesla/middleware/connection_pool.ex b/lib/pleroma/http/middleware/connection_pool.ex diff --git a/test/gun/conneciton_pool_test.exs b/test/pleroma/gun/connection_pool_test.exs diff --git a/test/migrations/20200716195806_autolinker_to_linkify_test.exs b/test/pleroma/repo/migrations/autolinker_to_linkify_test.exs diff --git a/test/migrations/20200802170532_fix_legacy_tags_test.exs b/test/pleroma/repo/migrations/fix_legacy_tags_test.exs diff --git a/test/migrations/20200722185515_fix_malformed_formatter_config_test.exs b/test/pleroma/repo/migrations/fix_malformed_formatter_config_test.exs diff --git a/test/migrations/20200724133313_move_welcome_settings_test.exs b/test/pleroma/repo/migrations/move_welcome_settings_test.exs diff --git a/test/report_note_test.exs b/test/pleroma/report_note_test.exs diff --git a/test/user/welcome_chat_massage_test.exs b/test/pleroma/user/welcome_chat_message_test.exs diff --git a/test/user/welcome_email_test.exs b/test/pleroma/user/welcome_email_test.exs diff --git a/test/user/welcome_message_test.exs b/test/pleroma/user/welcome_message_test.exs diff --git a/test/web/activity_pub/object_validators/accept_validation_test.exs b/test/pleroma/web/activity_pub/object_validators/accept_validation_test.exs diff --git a/test/web/activity_pub/object_validators/reject_validation_test.exs b/test/pleroma/web/activity_pub/object_validators/reject_validation_test.exs diff --git a/test/web/activity_pub/transmogrifier/accept_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs diff --git a/test/web/activity_pub/transmogrifier/answer_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs diff --git a/test/web/activity_pub/transmogrifier/question_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs diff --git a/test/web/activity_pub/transmogrifier/reject_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs diff --git a/test/pleroma/web/plugs/frontend_static_plug_test.exs b/test/pleroma/web/plugs/frontend_static_plug_test.exs @@ -0,0 +1,56 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do + use Pleroma.Web.ConnCase + + @dir "test/tmp/instance_static" + + setup do + File.mkdir_p!(@dir) + on_exit(fn -> File.rm_rf(@dir) end) + end + + setup do: clear_config([:instance, :static_dir], @dir) + + test "init will give a static plug config + the frontend type" do + opts = + [ + at: "/admin", + frontend_type: :admin + ] + |> Pleroma.Web.Plugs.FrontendStatic.init() + + assert opts[:at] == ["admin"] + assert opts[:frontend_type] == :admin + end + + test "overrides existing static files", %{conn: conn} do + name = "pelmora" + ref = "uguu" + + clear_config([:frontends, :primary], %{"name" => name, "ref" => ref}) + path = "#{@dir}/frontends/#{name}/#{ref}" + + File.mkdir_p!(path) + File.write!("#{path}/index.html", "from frontend plug") + + index = get(conn, "/") + assert html_response(index, 200) == "from frontend plug" + end + + test "overrides existing static files for the `pleroma/admin` path", %{conn: conn} do + name = "pelmora" + ref = "uguu" + + clear_config([:frontends, :admin], %{"name" => name, "ref" => ref}) + path = "#{@dir}/frontends/#{name}/#{ref}" + + File.mkdir_p!(path) + File.write!("#{path}/index.html", "from frontend plug") + + index = get(conn, "/pleroma/admin/") + assert html_response(index, 200) == "from frontend plug" + end +end diff --git a/test/plugs/frontend_static_test.exs b/test/plugs/frontend_static_test.exs @@ -1,57 +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.FrontendStaticPlugTest do - alias Pleroma.Plugs.FrontendStatic - use Pleroma.Web.ConnCase - - @dir "test/tmp/instance_static" - - setup do - File.mkdir_p!(@dir) - on_exit(fn -> File.rm_rf(@dir) end) - end - - setup do: clear_config([:instance, :static_dir], @dir) - - test "init will give a static plug config + the frontend type" do - opts = - [ - at: "/admin", - frontend_type: :admin - ] - |> FrontendStatic.init() - - assert opts[:at] == ["admin"] - assert opts[:frontend_type] == :admin - end - - test "overrides existing static files", %{conn: conn} do - name = "pelmora" - ref = "uguu" - - clear_config([:frontends, :primary], %{"name" => name, "ref" => ref}) - path = "#{@dir}/frontends/#{name}/#{ref}" - - File.mkdir_p!(path) - File.write!("#{path}/index.html", "from frontend plug") - - index = get(conn, "/") - assert html_response(index, 200) == "from frontend plug" - end - - test "overrides existing static files for the `pleroma/admin` path", %{conn: conn} do - name = "pelmora" - ref = "uguu" - - clear_config([:frontends, :admin], %{"name" => name, "ref" => ref}) - path = "#{@dir}/frontends/#{name}/#{ref}" - - File.mkdir_p!(path) - File.write!("#{path}/index.html", "from frontend plug") - - index = get(conn, "/pleroma/admin/") - assert html_response(index, 200) == "from frontend plug" - end -end