Page MenuHomePhorge
Files F85825515

No OneTemporary
Actions

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

View Options

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
@@ -1,57 +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.FrontendStaticPlugTest do
- alias Pleroma.Plugs.FrontendStatic
+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
]
- |> FrontendStatic.init()
+ |> 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

File Metadata

Mime Type
text/x-diff
Expires
Fri, Oct 30, 1:21 AM (1 d, 13 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1799085
Default Alt Text
(6 KB)

Event Timeline