fix existing tests

Author: SteffenDE

lib/phoenix_live_view/channel.ex

@@ -476,7 +476,8 @@ defmodule Phoenix.LiveView.Channel do
 
         Process.send_after(self(), {@prefix, :adoption_timeout}, timeout)
 
-        {:reply, {:ok, Diff.to_iodata(diff)}, {:adoptable, state}}
+        # TODO: check if we can avoid sending the assigns back
+        {:reply, {:ok, Diff.to_iodata(diff), socket.assigns}, {:adoptable, state}}
 
       {:stop, socket} ->
         {:stop, :shutdown, {:stop, socket}, nil}
@@ -1100,7 +1101,13 @@ defmodule Phoenix.LiveView.Channel do
     new_socket = Utils.clear_temp(socket)
 
     {:diff, diff,
-     %{state | socket: new_socket, fingerprints: fingerprints, components: components, initial_diff: nil}}
+     %{
+       state
+       | socket: new_socket,
+         fingerprints: fingerprints,
+         components: components,
+         initial_diff: nil
+     }}
   end
 
   defp reply(state, {ref, extra}, status, payload) do

lib/phoenix_live_view/controller.ex

@@ -37,14 +37,14 @@ defmodule Phoenix.LiveView.Controller do
   """
   def live_render(%Plug.Conn{} = conn, view, opts \\ []) do
     case LiveView.Static.render(conn, view, opts) do
-      {:ok, content} ->
+      {:ok, content, socket_assigns} ->
         conn
         |> Plug.Conn.fetch_query_params()
         |> ensure_format()
         |> Phoenix.Controller.put_view(LiveView.Static)
         |> Phoenix.Controller.render(
           :template,
-          %{content: content}
+          Map.merge(socket_assigns, %{content: content, live_module: view})
         )
 
       {:stop, %Socket{redirected: {:redirect, %{status: status} = opts}} = socket} ->

lib/phoenix_live_view/static.ex

@@ -174,7 +174,7 @@ defmodule Phoenix.LiveView.Static do
             ]
 
             try do
-              {:ok, to_rendered_content_tag(socket, tag, view, attrs)}
+              {:ok, to_rendered_content_tag(socket, tag, view, attrs), socket.assigns}
             catch
               :throw, {:phoenix, :child_redirect, redirected, flash} ->
                 {:stop, Utils.replace_flash(%{socket | redirected: redirected}, flash)}
@@ -210,7 +210,8 @@ defmodule Phoenix.LiveView.Static do
           )
 
         # TODO: handle call timeout
-        with {:ok, iodata} <- GenServer.call(pid, {:phoenix, :disconnected_adoptable_render}) do
+        with {:ok, iodata, assigns} <-
+               GenServer.call(pid, {:phoenix, :disconnected_adoptable_render}) do
           data_attrs = [
             phx_session: sign_root_session(socket, router, view, to_sign_session, live_session),
             phx_static: sign_static_token(socket),
@@ -225,7 +226,9 @@ defmodule Phoenix.LiveView.Static do
             | extended_attrs
           ]
 
-          {:ok, content_tag(tag, attrs, iodata)}
+          # TODO: we currently expect the socket assigns for LiveViewTest
+          # check if we can aboid copying assigns...
+          {:ok, content_tag(tag, attrs, iodata), assigns}
         end
     end
   end