From c4c5caedd809e46542ae3632762d93f14890d51d Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Sun, 16 Aug 2020 21:01:38 +0300 Subject: [PATCH] changes after rebase --- lib/pleroma/{tesla => http}/middleware/connection_pool.ex | 0 .../gun/connection_pool_test.exs} | 0 .../repo/migrations/autolinker_to_linkify_test.exs} | 0 .../repo/migrations/fix_legacy_tags_test.exs} | 0 .../repo/migrations/fix_malformed_formatter_config_test.exs} | 0 .../repo/migrations/move_welcome_settings_test.exs} | 0 test/{ => pleroma}/report_note_test.exs | 0 .../user/welcome_chat_message_test.exs} | 0 test/{ => pleroma}/user/welcome_email_test.exs | 0 test/{ => pleroma}/user/welcome_message_test.exs | 0 .../object_validators/accept_validation_test.exs | 0 .../object_validators/reject_validation_test.exs | 0 .../web/activity_pub/transmogrifier/accept_handling_test.exs | 0 .../web/activity_pub/transmogrifier/answer_handling_test.exs | 0 .../activity_pub/transmogrifier/question_handling_test.exs | 0 .../web/activity_pub/transmogrifier/reject_handling_test.exs | 0 .../web/plugs/frontend_static_plug_test.exs} | 5 ++--- 17 files changed, 2 insertions(+), 3 deletions(-) rename lib/pleroma/{tesla => http}/middleware/connection_pool.ex (100%) rename test/{gun/conneciton_pool_test.exs => pleroma/gun/connection_pool_test.exs} (100%) rename test/{migrations/20200716195806_autolinker_to_linkify_test.exs => pleroma/repo/migrations/autolinker_to_linkify_test.exs} (100%) rename test/{migrations/20200802170532_fix_legacy_tags_test.exs => pleroma/repo/migrations/fix_legacy_tags_test.exs} (100%) rename test/{migrations/20200722185515_fix_malformed_formatter_config_test.exs => pleroma/repo/migrations/fix_malformed_formatter_config_test.exs} (100%) rename test/{migrations/20200724133313_move_welcome_settings_test.exs => pleroma/repo/migrations/move_welcome_settings_test.exs} (100%) rename test/{ => pleroma}/report_note_test.exs (100%) rename test/{user/welcome_chat_massage_test.exs => pleroma/user/welcome_chat_message_test.exs} (100%) rename test/{ => pleroma}/user/welcome_email_test.exs (100%) rename test/{ => pleroma}/user/welcome_message_test.exs (100%) rename test/{ => pleroma}/web/activity_pub/object_validators/accept_validation_test.exs (100%) rename test/{ => pleroma}/web/activity_pub/object_validators/reject_validation_test.exs (100%) rename test/{ => pleroma}/web/activity_pub/transmogrifier/accept_handling_test.exs (100%) rename test/{ => pleroma}/web/activity_pub/transmogrifier/answer_handling_test.exs (100%) rename test/{ => pleroma}/web/activity_pub/transmogrifier/question_handling_test.exs (100%) rename test/{ => pleroma}/web/activity_pub/transmogrifier/reject_handling_test.exs (100%) rename test/{plugs/frontend_static_test.exs => pleroma/web/plugs/frontend_static_plug_test.exs} (92%) diff --git a/lib/pleroma/tesla/middleware/connection_pool.ex b/lib/pleroma/http/middleware/connection_pool.ex similarity index 100% rename from lib/pleroma/tesla/middleware/connection_pool.ex rename to lib/pleroma/http/middleware/connection_pool.ex diff --git a/test/gun/conneciton_pool_test.exs b/test/pleroma/gun/connection_pool_test.exs similarity index 100% rename from test/gun/conneciton_pool_test.exs rename to 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 similarity index 100% rename from test/migrations/20200716195806_autolinker_to_linkify_test.exs rename to 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 similarity index 100% rename from test/migrations/20200802170532_fix_legacy_tags_test.exs rename to 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 similarity index 100% rename from test/migrations/20200722185515_fix_malformed_formatter_config_test.exs rename to 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 similarity index 100% rename from test/migrations/20200724133313_move_welcome_settings_test.exs rename to test/pleroma/repo/migrations/move_welcome_settings_test.exs diff --git a/test/report_note_test.exs b/test/pleroma/report_note_test.exs similarity index 100% rename from test/report_note_test.exs rename to 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 similarity index 100% rename from test/user/welcome_chat_massage_test.exs rename to 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 similarity index 100% rename from test/user/welcome_email_test.exs rename to test/pleroma/user/welcome_email_test.exs diff --git a/test/user/welcome_message_test.exs b/test/pleroma/user/welcome_message_test.exs similarity index 100% rename from test/user/welcome_message_test.exs rename to 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 similarity index 100% rename from test/web/activity_pub/object_validators/accept_validation_test.exs rename to 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 similarity index 100% rename from test/web/activity_pub/object_validators/reject_validation_test.exs rename to 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 similarity index 100% rename from test/web/activity_pub/transmogrifier/accept_handling_test.exs rename to 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 similarity index 100% rename from test/web/activity_pub/transmogrifier/answer_handling_test.exs rename to 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 similarity index 100% rename from test/web/activity_pub/transmogrifier/question_handling_test.exs rename to 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 similarity index 100% rename from test/web/activity_pub/transmogrifier/reject_handling_test.exs rename to test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs diff --git a/test/plugs/frontend_static_test.exs b/test/pleroma/web/plugs/frontend_static_plug_test.exs similarity index 92% rename from test/plugs/frontend_static_test.exs rename to test/pleroma/web/plugs/frontend_static_plug_test.exs index 6f4923048..f6f7d7bdb 100644 --- a/test/plugs/frontend_static_test.exs +++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs @@ -2,8 +2,7 @@ # Copyright © 2017-2020 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Web.FrontendStaticPlugTest do - alias Pleroma.Plugs.FrontendStatic +defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do use Pleroma.Web.ConnCase @dir "test/tmp/instance_static" @@ -21,7 +20,7 @@ test "init will give a static plug config + the frontend type" do at: "/admin", frontend_type: :admin ] - |> FrontendStatic.init() + |> Pleroma.Web.Plugs.FrontendStatic.init() assert opts[:at] == ["admin"] assert opts[:frontend_type] == :admin