X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Ffeed%2Fuser_controller_test.exs;h=451ce45aa24cdb7fa804712957ff4547fcbac88c;hb=20e3cb2b25be4d9598bfc2cf3870f2f451974cb6;hp=6f6ff433f193332cd4c177c6f7f2fb9b41dce06a;hpb=028017711cdb7966008a303058c0b3f72492f985;p=akkoma diff --git a/test/pleroma/web/feed/user_controller_test.exs b/test/pleroma/web/feed/user_controller_test.exs index 6f6ff433f..451ce45aa 100644 --- a/test/pleroma/web/feed/user_controller_test.exs +++ b/test/pleroma/web/feed/user_controller_test.exs @@ -184,25 +184,39 @@ defmodule Pleroma.Web.Feed.UserControllerTest do note_activity = insert(:note_activity) user = User.get_cached_by_ap_id(note_activity.data["actor"]) + %{assigns: %{csp_nonce: nonce}} = resp_conn = get(conn, "/users/#{user.nickname}") + response = - conn - |> get("/users/#{user.nickname}") + resp_conn |> response(200) assert response == Pleroma.Web.Fallback.RedirectController.redirector_with_meta( - conn, + assign(conn, :csp_nonce, nonce), %{user: user} ).resp_body end - test "with html format, it returns error when user is not found", %{conn: conn} do + test "with html format, it falls back to frontend when user is remote", %{conn: conn} do + user = insert(:user, local: false) + + {:ok, _} = CommonAPI.post(user, %{status: "test"}) + + response = + conn + |> get("/users/#{user.nickname}") + |> response(200) + + assert response =~ "" + end + + test "with html format, it falls back to frontend when user is not found", %{conn: conn} do response = conn |> get("/users/jimm") - |> json_response(404) + |> response(200) - assert response == %{"error" => "Not found"} + assert response =~ "" end test "with non-html / non-json format, it redirects to user feed in atom format", %{