projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/database-configuration-whitelist' into 'develop'
[akkoma]
/
test
/
uploaders
/
s3_test.exs
diff --git
a/test/uploaders/s3_test.exs
b/test/uploaders/s3_test.exs
index 171316340db8ead0811158546a8be01981447215..d949c90a5c2ce183fb0a8d869a4f4edee1891ca4 100644
(file)
--- a/
test/uploaders/s3_test.exs
+++ b/
test/uploaders/s3_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.S3Test do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.S3Test do
@@
-11,12
+11,11
@@
defmodule Pleroma.Uploaders.S3Test do
import Mock
import ExUnit.CaptureLog
import Mock
import ExUnit.CaptureLog
- clear_config([Pleroma.Uploaders.S3]) do
- Config.put([Pleroma.Uploaders.S3],
- bucket: "test_bucket",
- public_endpoint: "https://s3.amazonaws.com"
- )
- end
+ setup do:
+ clear_config(Pleroma.Uploaders.S3,
+ bucket: "test_bucket",
+ public_endpoint: "https://s3.amazonaws.com"
+ )
describe "get_file/1" do
test "it returns path to local folder for files" do
describe "get_file/1" do
test "it returns path to local folder for files" do
@@
-59,7
+58,7
@@
defmodule Pleroma.Uploaders.S3Test do
name: "image-tet.jpg",
content_type: "image/jpg",
path: "test_folder/image-tet.jpg",
name: "image-tet.jpg",
content_type: "image/jpg",
path: "test_folder/image-tet.jpg",
- tempfile: Path.absname("test/
fixtures/image_tmp.jp
g")
+ tempfile: Path.absname("test/
instance_static/add/shortcode.pn
g")
}
[file_upload: file_upload]
}
[file_upload: file_upload]
@@
-79,4
+78,11
@@
defmodule Pleroma.Uploaders.S3Test do
end
end
end
end
end
end
+
+ describe "delete_file/1" do
+ test_with_mock "deletes file", ExAws, request: fn _req -> {:ok, %{status_code: 204}} end do
+ assert :ok = S3.delete_file("image.jpg")
+ assert_called(ExAws.request(:_))
+ end
+ end
end
end