summaryrefslogtreecommitdiff
path: root/test/upload
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-16 13:17:52 +0000
committerlain <lain@soykaf.club>2020-06-16 13:17:52 +0000
commit4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9 (patch)
treed657b3af0d48fbb00504254d416876390b046d6a /test/upload
parent1e49bfa9acb4176a161181edcaf04e886c638c42 (diff)
parent32c6576b600e2f24310f429f4b2391f95a5b5ba0 (diff)
downloadpleroma-4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9.tar.gz
pleroma-4baf5ffe739fd99d0e6ab1cd7e22859c14f395c9.zip
Merge branch 'fix/1787-mogrify-args' into 'develop'
Mogrify args in adminFE Closes #1787 See merge request pleroma/pleroma!2616
Diffstat (limited to 'test/upload')
-rw-r--r--test/upload/filter/mogrify_test.exs8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/upload/filter/mogrify_test.exs b/test/upload/filter/mogrify_test.exs
index b6a463e8c..62ca30487 100644
--- a/test/upload/filter/mogrify_test.exs
+++ b/test/upload/filter/mogrify_test.exs
@@ -6,21 +6,17 @@ defmodule Pleroma.Upload.Filter.MogrifyTest do
use Pleroma.DataCase
import Mock
- alias Pleroma.Config
- alias Pleroma.Upload
alias Pleroma.Upload.Filter
- setup do: clear_config([Filter.Mogrify, :args])
-
test "apply mogrify filter" do
- Config.put([Filter.Mogrify, :args], [{"tint", "40"}])
+ clear_config(Filter.Mogrify, args: [{"tint", "40"}])
File.cp!(
"test/fixtures/image.jpg",
"test/fixtures/image_tmp.jpg"
)
- upload = %Upload{
+ upload = %Pleroma.Upload{
name: "an… image.jpg",
content_type: "image/jpg",
path: Path.absname("test/fixtures/image_tmp.jpg"),