diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-06-30 15:09:03 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-06-30 15:09:03 -0500 |
commit | 0883a706dc376fdfb7de9df1366803e87c8e7c98 (patch) | |
tree | dc43f7b09dddd3300efd7b3ebbc0e82e60a978c5 /test/upload | |
parent | 954acdda2072cac343409b3d17d831b86ac6a18c (diff) | |
parent | b9e6ad571ac5925431466d6e6b27c0b372bb7727 (diff) | |
download | pleroma-0883a706dc376fdfb7de9df1366803e87c8e7c98.tar.gz pleroma-0883a706dc376fdfb7de9df1366803e87c8e7c98.zip |
Merge branch 'develop' into activation-meta
Diffstat (limited to 'test/upload')
-rw-r--r-- | test/upload/filter/mogrify_test.exs | 8 |
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"), |