projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issues/1016' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
mastodon_api_controller_test.exs
diff --git
a/test/web/mastodon_api/mastodon_api_controller_test.exs
b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 707723421fab1e06d46ceddd55118727f4f2c1a8..17e723528ba6f2724f9aa8647a88645090d74828 100644
(file)
--- a/
test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/
test/web/mastodon_api/mastodon_api_controller_test.exs
@@
-312,7
+312,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
conn
|> assign(:user, user)
|> post("/api/v1/statuses", %{
conn
|> assign(:user, user)
|> post("/api/v1/statuses", %{
- "status" => "http://example.com/ogp"
+ "status" => "http
s
://example.com/ogp"
})
assert %{"id" => id, "card" => %{"title" => "The Rock"}} = json_response(conn, 200)
})
assert %{"id" => id, "card" => %{"title" => "The Rock"}} = json_response(conn, 200)
@@
-2557,7
+2557,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
end
test "returns rich-media card", %{conn: conn, user: user} do
end
test "returns rich-media card", %{conn: conn, user: user} do
- {:ok, activity} = CommonAPI.post(user, %{"status" => "http://example.com/ogp"})
+ {:ok, activity} = CommonAPI.post(user, %{"status" => "http
s
://example.com/ogp"})
card_data = %{
"image" => "http://ia.media-imdb.com/images/rock.jpg",
card_data = %{
"image" => "http://ia.media-imdb.com/images/rock.jpg",
@@
-2589,7
+2589,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
# works with private posts
{:ok, activity} =
# works with private posts
{:ok, activity} =
- CommonAPI.post(user, %{"status" => "http://example.com/ogp", "visibility" => "direct"})
+ CommonAPI.post(user, %{"status" => "http
s
://example.com/ogp", "visibility" => "direct"})
response_two =
conn
response_two =
conn
@@
-2601,7
+2601,8
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
end
test "replaces missing description with an empty string", %{conn: conn, user: user} do
end
test "replaces missing description with an empty string", %{conn: conn, user: user} do
- {:ok, activity} = CommonAPI.post(user, %{"status" => "http://example.com/ogp-missing-data"})
+ {:ok, activity} =
+ CommonAPI.post(user, %{"status" => "https://example.com/ogp-missing-data"})
response =
conn
response =
conn