diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 15:48:51 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 15:48:51 +0400 |
| commit | a7627bdc7ae67a5c103f968eea02d6b1cf1ef8da (patch) | |
| tree | e12af401307cfc3120d50c01580cd959f3b2503a /test/uploaders/s3_test.exs | |
| parent | decaa64f75f8bd69622fa5fba757f99719f09808 (diff) | |
| parent | e96765df6b04fe5e9766271a9c62e559392758b2 (diff) | |
| download | pleroma-a7627bdc7ae67a5c103f968eea02d6b1cf1ef8da.tar.gz pleroma-a7627bdc7ae67a5c103f968eea02d6b1cf1ef8da.zip | |
Merge remote-tracking branch 'origin/develop' into global-status-expiration
Diffstat (limited to 'test/uploaders/s3_test.exs')
| -rw-r--r-- | test/uploaders/s3_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/uploaders/s3_test.exs b/test/uploaders/s3_test.exs index 6950ccb25..d949c90a5 100644 --- a/test/uploaders/s3_test.exs +++ b/test/uploaders/s3_test.exs @@ -58,7 +58,7 @@ defmodule Pleroma.Uploaders.S3Test do name: "image-tet.jpg", content_type: "image/jpg", path: "test_folder/image-tet.jpg", - tempfile: Path.absname("test/fixtures/image_tmp.jpg") + tempfile: Path.absname("test/instance_static/add/shortcode.png") } [file_upload: file_upload] |