Fix Phoenix upstream migration regressions
This commit is contained in:
parent
216a00f73f
commit
ab9fd33762
4 changed files with 52 additions and 8 deletions
|
|
@ -279,6 +279,26 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
|||
end)
|
||||
end
|
||||
|
||||
test "accepts Phoenix 1.8 sec-websocket headers connect info before query params", %{
|
||||
token: token,
|
||||
user: user
|
||||
} do
|
||||
assert {:ok, state} =
|
||||
Pleroma.Web.MastodonAPI.WebsocketHandler.connect(%{
|
||||
params: %{"stream" => "user", "access_token" => "invalid"},
|
||||
connect_info: %{
|
||||
sec_websocket_headers: [
|
||||
{"sec-websocket-version", "13"},
|
||||
{"sec-websocket-protocol", token.token}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
assert state.user.id == user.id
|
||||
assert state.oauth_token.id == token.id
|
||||
assert state.topics != []
|
||||
end
|
||||
|
||||
test "accepts valid token on client-sent event", %{token: token} do
|
||||
assert {:ok, pid} = start_socket()
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,15 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
|
|||
assert html_response(conn, 200) =~ user.nickname
|
||||
end
|
||||
|
||||
test "renders profile HTML inside the default app layout", %{conn: conn, user: user} do
|
||||
conn = get(conn, "/users/#{user.nickname}")
|
||||
|
||||
html = html_response(conn, 200)
|
||||
assert html =~ "<!DOCTYPE html>"
|
||||
assert html =~ ~s(class="instance-header")
|
||||
assert html =~ ~s(<link rel="stylesheet" href="/instance/static.css">)
|
||||
end
|
||||
|
||||
test "404 when user not found", %{conn: conn} do
|
||||
conn = get(conn, "/users/limpopo")
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue