logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 7e43abce685e0336e8b737b08a49c2c97a605786
parent ac1298fce817e10cb357162441c77d860c4c757d
Author: lain <lain@soykaf.club>
Date:   Thu,  7 Jan 2021 19:16:58 +0000

Merge branch 'backup-ids' into 'develop'

Backups: render ID in API

See merge request pleroma/pleroma!3245

Diffstat:

Mlib/pleroma/web/pleroma_api/views/backup_view.ex1+
Atest/pleroma/web/pleroma_api/views/backup_view_test.exs18++++++++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/web/pleroma_api/views/backup_view.ex b/lib/pleroma/web/pleroma_api/views/backup_view.ex @@ -10,6 +10,7 @@ defmodule Pleroma.Web.PleromaAPI.BackupView do def render("show.json", %{backup: %Backup{} = backup}) do %{ + id: backup.id, content_type: backup.content_type, url: download_url(backup), file_size: backup.file_size, diff --git a/test/pleroma/web/pleroma_api/views/backup_view_test.exs b/test/pleroma/web/pleroma_api/views/backup_view_test.exs @@ -0,0 +1,18 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.PleromaAPI.BackupViewTest do + use Pleroma.DataCase, async: true + alias Pleroma.User.Backup + alias Pleroma.Web.PleromaAPI.BackupView + import Pleroma.Factory + + test "it renders the ID" do + user = insert(:user) + backup = Backup.new(user) + + result = BackupView.render("show.json", backup: backup) + assert result.id == backup.id + end +end