commit: d83c2bd330d1ed01b84634b70dfe024020ebfd6c
parent 03e306785b2013fe6fd47b59d4e578c6ed586b08
Author: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 29 Oct 2020 16:37:50 +0400
Add support for install via `file` and `build_url` params
Diffstat:
4 files changed, 74 insertions(+), 25 deletions(-)
diff --git a/lib/pleroma/frontend.ex b/lib/pleroma/frontend.ex
@@ -8,16 +8,16 @@ defmodule Pleroma.Frontend do
require Logger
def install(name, opts \\ []) do
- cmd_frontend_info = %{
+ frontend_info = %{
"ref" => opts[:ref],
"build_url" => opts[:build_url],
"build_dir" => opts[:build_dir]
}
- config_frontend_info = Config.get([:frontends, :available, name], %{})
-
frontend_info =
- Map.merge(config_frontend_info, cmd_frontend_info, fn _key, config, cmd ->
+ [:frontends, :available, name]
+ |> Config.get(%{})
+ |> Map.merge(frontend_info, fn _key, config, cmd ->
# This only overrides things that are actually set
cmd || config
end)
diff --git a/lib/pleroma/web/api_spec/operations/admin/frontend_operation.ex b/lib/pleroma/web/api_spec/operations/admin/frontend_operation.ex
@@ -49,7 +49,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.FrontendOperation do
properties: %{
name: %Schema{type: :string},
git: %Schema{type: :string, format: :uri, nullable: true},
- build_url: %Schema{type: :string, format: :uri},
+ build_url: %Schema{type: :string, format: :uri, nullable: true},
ref: %Schema{type: :string},
installed: %Schema{type: :boolean}
}
@@ -64,12 +64,19 @@ defmodule Pleroma.Web.ApiSpec.Admin.FrontendOperation do
required: [:name],
properties: %{
name: %Schema{
- type: :string,
- nullable: false
+ type: :string
},
ref: %Schema{
- type: :string,
- nullable: false
+ type: :string
+ },
+ file: %Schema{
+ type: :string
+ },
+ build_url: %Schema{
+ type: :string
+ },
+ build_dir: %Schema{
+ type: :string
}
}
}
diff --git a/test/pleroma/frontend_test.exs b/test/pleroma/frontend_test.exs
@@ -6,8 +6,6 @@ defmodule Pleroma.FrontendTest do
use Pleroma.DataCase
alias Pleroma.Frontend
- import ExUnit.CaptureIO, only: [capture_io: 1]
-
@dir "test/frontend_static_test"
setup do
@@ -32,9 +30,7 @@ defmodule Pleroma.FrontendTest do
%Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/frontend_dist.zip")}
end)
- capture_io(fn ->
- Frontend.install("pleroma")
- end)
+ Frontend.install("pleroma")
assert File.exists?(Path.join([@dir, "frontends", "pleroma", "fantasy", "test.txt"]))
end
@@ -54,9 +50,7 @@ defmodule Pleroma.FrontendTest do
File.write!(previously_existing, "yey")
assert File.exists?(previously_existing)
- capture_io(fn ->
- Frontend.install("pleroma", file: "test/fixtures/tesla_mock/frontend.zip")
- end)
+ Frontend.install("pleroma", file: "test/fixtures/tesla_mock/frontend.zip")
assert File.exists?(Path.join([folder, "test.txt"]))
refute File.exists?(previously_existing)
@@ -67,13 +61,11 @@ defmodule Pleroma.FrontendTest do
%Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/frontend.zip")}
end)
- capture_io(fn ->
- Frontend.install("unknown",
- ref: "baka",
- build_url: "http://gensokyo.2hu/madeup.zip",
- build_dir: ""
- )
- end)
+ Frontend.install("unknown",
+ ref: "baka",
+ build_url: "http://gensokyo.2hu/madeup.zip",
+ build_dir: ""
+ )
assert File.exists?(Path.join([@dir, "frontends", "unknown", "baka", "test.txt"]))
end
diff --git a/test/pleroma/web/admin_api/controllers/frontend_controller_test.exs b/test/pleroma/web/admin_api/controllers/frontend_controller_test.exs
@@ -48,7 +48,7 @@ defmodule Pleroma.Web.AdminAPI.FrontendControllerTest do
end
describe "POST /api/pleroma/admin/frontends" do
- test "it installs a frontend", %{conn: conn} do
+ test "from available frontends", %{conn: conn} do
clear_config([:frontends, :available], %{
"pleroma" => %{
"ref" => "fantasy",
@@ -90,5 +90,55 @@ defmodule Pleroma.Web.AdminAPI.FrontendControllerTest do
}
]
end
+
+ test "from a file", %{conn: conn} do
+ clear_config([:frontends, :available], %{
+ "pleroma" => %{
+ "ref" => "fantasy",
+ "name" => "pleroma",
+ "build_dir" => ""
+ }
+ })
+
+ conn
+ |> put_req_header("content-type", "application/json")
+ |> post("/api/pleroma/admin/frontends", %{
+ name: "pleroma",
+ file: "test/fixtures/tesla_mock/frontend.zip"
+ })
+ |> json_response_and_validate_schema(:ok)
+
+ assert_enqueued(
+ worker: FrontendInstallerWorker,
+ args: %{
+ "name" => "pleroma",
+ "opts" => %{"file" => "test/fixtures/tesla_mock/frontend.zip"}
+ }
+ )
+
+ ObanHelpers.perform(all_enqueued(worker: FrontendInstallerWorker))
+
+ assert File.exists?(Path.join([@dir, "frontends", "pleroma", "fantasy", "test.txt"]))
+ end
+
+ test "from an URL", %{conn: conn} do
+ Tesla.Mock.mock(fn %{url: "http://gensokyo.2hu/madeup.zip"} ->
+ %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/frontend.zip")}
+ end)
+
+ conn
+ |> put_req_header("content-type", "application/json")
+ |> post("/api/pleroma/admin/frontends", %{
+ name: "unknown",
+ ref: "baka",
+ build_url: "http://gensokyo.2hu/madeup.zip",
+ build_dir: ""
+ })
+ |> json_response_and_validate_schema(:ok)
+
+ ObanHelpers.perform(all_enqueued(worker: FrontendInstallerWorker))
+
+ assert File.exists?(Path.join([@dir, "frontends", "unknown", "baka", "test.txt"]))
+ end
end
end
