diff options
| author | lain <lain@soykaf.club> | 2020-05-15 13:33:04 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-15 13:33:04 +0200 |
| commit | f012c3a202ef43d1a8a1dc88f08057b7a41d3d78 (patch) | |
| tree | a3847182efa357bce56c12d6253492dc0cc2b894 /test/uploaders/s3_test.exs | |
| parent | 1d18721a3c60aa0acc7d1ba858a92277e544a54a (diff) | |
| parent | 081d1d3f48f2264ee329f7ff7af7c2f88fe0a654 (diff) | |
| download | pleroma-f012c3a202ef43d1a8a1dc88f08057b7a41d3d78.tar.gz pleroma-f012c3a202ef43d1a8a1dc88f08057b7a41d3d78.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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] |