limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

fix tests

Browse source
This commit is contained in:
FloatingGhost 2023-04-14 15:20:55 +01:00
parent de64c6c54a
commit 1b2c24a19e
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/plugs/frontend_static.ex
View file

@ -50,7 +50,6 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
end end
def call(conn, opts) do def call(conn, opts) do
IO.inspect("OPTS: #{inspect(opts)}")
with false <- api_route?(conn.path_info), with false <- api_route?(conn.path_info),
false <- invalid_path?(conn.path_info), false <- invalid_path?(conn.path_info),
true <- enabled?(opts[:if]), true <- enabled?(opts[:if]),
@ -83,7 +82,7 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
end end
end end
def preferred_or_fallback(conn, fallback), do: fallback def preferred_or_fallback(_conn, fallback), do: fallback
defp enabled?(if_opt) when is_function(if_opt), do: if_opt.() defp enabled?(if_opt) when is_function(if_opt), do: if_opt.()
defp enabled?(true), do: true defp enabled?(true), do: true
@ -106,7 +105,6 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
defp call_static(conn, opts, from) do defp call_static(conn, opts, from) do
opts = Map.put(opts, :from, from) opts = Map.put(opts, :from, from)
IO.inspect(opts, label: "opts")
Plug.Static.call(conn, opts) Plug.Static.call(conn, opts)
end end
end end

1
test/pleroma/web/plugs/frontend_static_plug_test.exs
View file

@ -83,6 +83,7 @@ defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do
"main", "main",
"ostatus_subscribe", "ostatus_subscribe",
"oauth", "oauth",
"akkoma",
"objects", "objects",
"activities", "activities",
"notice", "notice",