projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feat/rich-media-improvements' into 'develop'
[akkoma]
/
test
/
web
/
rich_media
/
aws_signed_url_test.exs
diff --git
a/test/web/rich_media/aws_signed_url_test.exs
b/test/web/rich_media/aws_signed_url_test.exs
index a3a50cbb19b6a0466b579845fc845f2c9df6bc17..1ceae1a31569adc673fec9b2308dc54861787d57 100644
(file)
--- a/
test/web/rich_media/aws_signed_url_test.exs
+++ b/
test/web/rich_media/aws_signed_url_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.Web.RichMedia.TTL.AwsSignedUrlTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.TTL.AwsSignedUrlTest do
@@
-21,7
+21,7
@@
defmodule Pleroma.Web.RichMedia.TTL.AwsSignedUrlTest do
expire_time =
Timex.parse!(timestamp, "{ISO:Basic:Z}") |> Timex.to_unix() |> Kernel.+(valid_till)
expire_time =
Timex.parse!(timestamp, "{ISO:Basic:Z}") |> Timex.to_unix() |> Kernel.+(valid_till)
- assert
expire_time
== Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl.ttl(metadata, url)
+ assert
{:ok, expire_time}
== Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl.ttl(metadata, url)
end
test "s3 signed url is parsed and correct ttl is set for rich media" do
end
test "s3 signed url is parsed and correct ttl is set for rich media" do
@@
-55,7
+55,7
@@
defmodule Pleroma.Web.RichMedia.TTL.AwsSignedUrlTest do
Cachex.put(:rich_media_cache, url, metadata)
Cachex.put(:rich_media_cache, url, metadata)
- Pleroma.Web.RichMedia.Parser.set_ttl_based_on_image(
{:ok, metadata}
, url)
+ Pleroma.Web.RichMedia.Parser.set_ttl_based_on_image(
metadata
, url)
{:ok, cache_ttl} = Cachex.ttl(:rich_media_cache, url)
{:ok, cache_ttl} = Cachex.ttl(:rich_media_cache, url)