diff options
| author | feld <feld@feld.me> | 2021-01-20 22:48:48 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-20 22:48:48 +0000 |
| commit | 2926713fe5c36b8fc64bcce13ca16bc12eaff96c (patch) | |
| tree | 7c0acf2b0843fdd6d4ec380eeb98f62ee12ee7cc /test/pleroma/upload_test.exs | |
| parent | 2905df841bb820c0016782483567beef68252f89 (diff) | |
| parent | 086100e3b7cad827c0f377fdcc4ae9d3b66327c7 (diff) | |
| download | pleroma-2926713fe5c36b8fc64bcce13ca16bc12eaff96c.tar.gz | |
Merge branch 'deprecate-public_endpoint' into 'develop'
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
Diffstat (limited to 'test/pleroma/upload_test.exs')
| -rw-r--r-- | test/pleroma/upload_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/pleroma/upload_test.exs b/test/pleroma/upload_test.exs index 8feb532d3..f1ab82a57 100644 --- a/test/pleroma/upload_test.exs +++ b/test/pleroma/upload_test.exs @@ -133,7 +133,7 @@ defmodule Pleroma.UploadTest do assert %{"url" => [%{"href" => url}]} = data - assert String.starts_with?(url, Pleroma.Web.base_url() <> "/media/") + assert String.starts_with?(url, Pleroma.Upload.base_url()) end test "copies the file to the configured folder with deduping" do @@ -148,8 +148,8 @@ defmodule Pleroma.UploadTest do {:ok, data} = Upload.store(file, filters: [Pleroma.Upload.Filter.Dedupe]) assert List.first(data["url"])["href"] == - Pleroma.Web.base_url() <> - "/media/e30397b58d226d6583ab5b8b3c5defb0c682bda5c31ef07a9f57c1c4986e3781.jpg" + Pleroma.Upload.base_url() <> + "e30397b58d226d6583ab5b8b3c5defb0c682bda5c31ef07a9f57c1c4986e3781.jpg" end test "copies the file to the configured folder without deduping" do |