summaryrefslogtreecommitdiff
path: root/test/upload
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-06-23 20:56:55 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-06-23 20:56:55 +0300
commit1471b70ef1550df91687276968108231f1bab604 (patch)
tree3a59e7497d665d5ce3d6445132453518bc50601d /test/upload
parent604a83ae3efe21b231fb524203a883a062102546 (diff)
parentc7d69e925664ce7125c3938c298d72e94a2a1349 (diff)
downloadpleroma-1471b70ef1550df91687276968108231f1bab604.tar.gz
pleroma-1471b70ef1550df91687276968108231f1bab604.zip
Merge develop
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"),