diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-06-17 12:50:06 -0500 | 
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-06-17 12:50:06 -0500 | 
| commit | 3462d4b995a995ad523139a865b34a824e02674d (patch) | |
| tree | 273a000ee55c9bb6a5344a507025600508227382 /test/upload | |
| parent | 96493da7bdab4ff4a51cbebf18df4127ddc47990 (diff) | |
| parent | d772361e6209e6b5733e9fe52b3671cd222060b3 (diff) | |
| download | pleroma-3462d4b995a995ad523139a865b34a824e02674d.tar.gz pleroma-3462d4b995a995ad523139a865b34a824e02674d.zip  | |
Merge branch 'develop' into issue/1855
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"),  | 
