diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2021-03-21 13:41:20 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2021-05-11 17:57:05 +0300 |
| commit | b4a0f721fea260f4832df7f7ee729a559907e935 (patch) | |
| tree | 224aebed428b3afedb63dd780ad4540f24c76e75 | |
| parent | e0246e0d597e723fe06ef6dc45d90c6102513d2e (diff) | |
| download | pleroma-b4a0f721fea260f4832df7f7ee729a559907e935.tar.gz | |
rebase fixfeature/1469-webfinger-expanding
| -rw-r--r-- | test/pleroma/user_test.exs | 16 | ||||
| -rw-r--r-- | test/pleroma/web/web_finger_test.exs | 6 |
2 files changed, 17 insertions, 5 deletions
diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs index e3c263880..6cf8c97f5 100644 --- a/test/pleroma/user_test.exs +++ b/test/pleroma/user_test.exs @@ -808,7 +808,8 @@ defmodule Pleroma.UserTest do |> File.read!() |> String.replace("{{nickname}}", "a") |> String.replace("{{domain}}", "example.com") - |> String.replace("{{subdomain}}", "sub.example.com") + |> String.replace("{{subdomain}}", "sub.example.com"), + headers: [{"content-type", "application/jrd+json"}] } %{url: "https://sub.example.com/users/a"} -> @@ -821,6 +822,16 @@ defmodule Pleroma.UserTest do |> String.replace("{{domain}}", "sub.example.com"), headers: [{"content-type", "application/activity+json"}] } + + %{url: "https://sub.example.com/users/a/collections/featured"} -> + %Tesla.Env{ + status: 200, + body: + File.read!("test/fixtures/users_mock/masto_featured.json") + |> String.replace("{{domain}}", "sub.example.com") + |> String.replace("{{nickname}}", "a"), + headers: [{"content-type", "application/activity+json"}] + } end) ap_id = "a@example.com" @@ -855,7 +866,8 @@ defmodule Pleroma.UserTest do |> File.read!() |> String.replace("{{nickname}}", "a") |> String.replace("{{domain}}", "example.com") - |> String.replace("{{subdomain}}", "sub.example.com") + |> String.replace("{{subdomain}}", "sub.example.com"), + headers: [{"content-type", "application/jrd+json"}] } %{url: "https://sub.example.com/users/a"} -> diff --git a/test/pleroma/web/web_finger_test.exs b/test/pleroma/web/web_finger_test.exs index b343df814..b8286d18c 100644 --- a/test/pleroma/web/web_finger_test.exs +++ b/test/pleroma/web/web_finger_test.exs @@ -47,7 +47,7 @@ defmodule Pleroma.Web.WebFingerTest do test "returns error when there is no content-type header" do Tesla.Mock.mock(fn - %{url: "http://social.heldscal.la/.well-known/host-meta"} -> + %{url: "https://social.heldscal.la/.well-known/host-meta"} -> {:ok, %Tesla.Env{ status: 200, @@ -147,7 +147,7 @@ defmodule Pleroma.Web.WebFingerTest do headers: [{"content-type", "application/jrd+json"}] }} - %{url: "http://mastodon.social/.well-known/host-meta"} -> + %{url: "https://mastodon.social/.well-known/host-meta"} -> {:ok, %Tesla.Env{ status: 200, @@ -170,7 +170,7 @@ defmodule Pleroma.Web.WebFingerTest do headers: [{"content-type", "application/xrd+xml"}] }} - %{url: "http://pawoo.net/.well-known/host-meta"} -> + %{url: "https://pawoo.net/.well-known/host-meta"} -> {:ok, %Tesla.Env{ status: 200, |