diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-29 16:09:49 +0400 | 
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-29 16:09:49 +0400 | 
| commit | 4a306720e8be8633e192f7b2c98f129a315939b9 (patch) | |
| tree | ed5ec059c532777a28eade72f384c8a800ead496 /test/upload/filter | |
| parent | d15aa9d9503e59b3cd0731394855781f435ec63c (diff) | |
| parent | 651f269568cb7e54cd96d8a0d8ea3533f77e9a3a (diff) | |
| download | pleroma-4a306720e8be8633e192f7b2c98f129a315939b9.tar.gz pleroma-4a306720e8be8633e192f7b2c98f129a315939b9.zip  | |
Merge branch 'develop' into remove-twitter-api
Diffstat (limited to 'test/upload/filter')
| -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"),  | 
