diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-06-25 14:16:28 -0500 | 
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-06-25 14:26:21 -0500 | 
| commit | 433c01b370f4bf68d3f016d86c1527b1319e7a0c (patch) | |
| tree | 607d6c7e4e578d6e0ff95963b5565baefc207d85 /test/upload | |
| parent | d4b20c96c4030ebb5eb908dc6efcf45be7a8355d (diff) | |
| parent | 1d0804b49f56fe722b12f83269d98acfdee7ac77 (diff) | |
| download | pleroma-433c01b370f4bf68d3f016d86c1527b1319e7a0c.tar.gz pleroma-433c01b370f4bf68d3f016d86c1527b1319e7a0c.zip  | |
Merge branch 'develop' into refactor/notification_settings
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"),  | 
