diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-08 17:24:09 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-08 17:24:09 -0500 |
| commit | 3f9263fb16ad519d2dd45106549a8ba42b68fc1f (patch) | |
| tree | a48eb564f7f037a876a4d2131f8571aa33702b22 /test/web/rich_media/aws_signed_url_test.exs | |
| parent | 24ce9c011caf7401fb261c7df4196b2ef9ba3d90 (diff) | |
| parent | 74be4de3f6c2c34447029649526637411acfa9f3 (diff) | |
| download | pleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.tar.gz pleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.zip | |
Merge remote-tracking branch 'upstream/develop' into restrict-origin
Diffstat (limited to 'test/web/rich_media/aws_signed_url_test.exs')
| -rw-r--r-- | test/web/rich_media/aws_signed_url_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/rich_media/aws_signed_url_test.exs b/test/web/rich_media/aws_signed_url_test.exs index b30f4400e..1ceae1a31 100644 --- a/test/web/rich_media/aws_signed_url_test.exs +++ b/test/web/rich_media/aws_signed_url_test.exs @@ -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) - 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 @@ -55,7 +55,7 @@ defmodule Pleroma.Web.RichMedia.TTL.AwsSignedUrlTest do 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) |