mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-17 18:49:15 +00:00
Code Issues Wiki Activity

Fix tests

Browse source
This commit is contained in:
Egor Kislitsyn 2020-08-31 23:07:14 +04:00
parent be42ab70dc
commit 75e07ba206
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
2 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/export.ex
View file

@ -39,7 +39,8 @@ def upload(zip_path) do
path: id <> "/" <> file_name
}
with :ok <- uploader.put_file(upload), :ok <- File.rm(zip_path) do
with {:ok, _} <- Pleroma.Uploaders.Uploader.put_file(uploader, upload),
:ok <- File.rm(zip_path) do
{:ok, upload}
end
end

27
test/export_test.exs
View file

@ -5,6 +5,7 @@
defmodule Pleroma.ExportTest do
use Pleroma.DataCase
import Pleroma.Factory
import Mock
alias Pleroma.Bookmark
alias Pleroma.Web.CommonAPI
@ -109,7 +110,15 @@ test "it exports user data" do
File.rm!(path)
end
test "it uploads an exported backup archive" do
describe "it uploads an exported backup archive" do
setup do
clear_config(Pleroma.Uploaders.S3,
bucket: "test_bucket",
public_endpoint: "https://s3.amazonaws.com"
)
clear_config([Pleroma.Upload, :uploader])
user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})
{:ok, status1} = CommonAPI.post(user, %{status: "status1"})
@ -121,6 +130,22 @@ test "it uploads an exported backup archive" do
Bookmark.create(user.id, status3.id)
assert {:ok, path} = Pleroma.Export.run(user)
[path: path]
end
test "S3", %{path: path} do
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
with_mock ExAws, request: fn _ -> {:ok, :ok} end do
assert {:ok, %Pleroma.Upload{}} = Pleroma.Export.upload(path)
end
end
test "Local", %{path: path} do
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
assert {:ok, %Pleroma.Upload{}} = Pleroma.Export.upload(path)
end
end
end