Fixed test suite

config/test.exs

@@ -27,4 +27,4 @@ config :live_view_native_test,
     %{path: "/template", module: LiveViewNativeTest.TemplateLive}
   ]
 
-config :phoenix, :plug_init_mode, :runtime
+config :phoenix, :plug_init_mode, :runtime

lib/live_view_native/renderer.ex

@@ -28,8 +28,8 @@ defmodule LiveViewNative.Renderer do
     else
       quote do
         def unquote(name)(var!(assigns)) do
-          target = LiveViewNative.Utils.get_target(var!(assigns))
-          apply(__MODULE__, unquote(name), [var!(assigns), %{target: target}])
+          interface = LiveViewNative.Utils.get_interface(var!(assigns))
+          apply(__MODULE__, unquote(name), [var!(assigns), interface])
         end
       end
     end
@@ -123,7 +123,7 @@ defmodule LiveViewNative.Renderer do
               quote do
                 @file unquote(template)
                 @external_resource unquote(template)
-                def unquote(name)(var!(assigns), _) do
+                def unquote(name)(var!(assigns), _interface) do
                   unquote(ast)
                 end
               end
@@ -132,7 +132,7 @@ defmodule LiveViewNative.Renderer do
               quote do
                 @file unquote(template)
                 @external_resource unquote(template)
-                def unquote(name)(var!(assigns), %{target: unquote(target)}) do
+                def unquote(name)(var!(assigns), %{"target" => unquote(target)}) do
                   unquote(ast)
                 end
               end

lib/live_view_native/utils.ex

@@ -5,9 +5,9 @@ defmodule LiveViewNative.Utils do
   def get_format(%Socket{private: %{connect_params: %{"_format" => format}}}), do: format
   def get_format(_socket), do: "html"
 
-  def get_target(%{socket: %Socket{private: %{connect_info: %{params: %{"target" => target}}}}}), do: target
-  def get_target(%{conn: %Plug.Conn{params: %{"target" => target}}}), do: target
-  def get_target(_socket), do: nil
+  def get_interface(%{socket: %Socket{private: %{connect_info: %{params: %{"_interface" => interface}}}}}), do: interface
+  def get_interface(%{conn: %Plug.Conn{params: %{"_interface" => interface}}}), do: interface
+  def get_interface(_socket), do: %{}
 
   def stringify_format(format) when is_binary(format), do: format
   def stringify_format(format) when is_atom(format), do: Atom.to_string(format)

mix.exs

@@ -1,7 +1,7 @@
 defmodule LiveViewNative.MixProject do
   use Mix.Project
 
-  @version "0.2.0"
+  @version "0.3.0-alpha.1"
 
   def project do
     [
@@ -16,7 +16,6 @@ defmodule LiveViewNative.MixProject do
       aliases: aliases(),
       deps: deps(),
       test_coverage: [tool: ExCoveralls],
-      consolidate_protocols: Mix.env() != :test,
       docs: docs()
     ]
   end
@@ -53,8 +52,8 @@ defmodule LiveViewNative.MixProject do
       {:makeup_eex, ">= 0.1.1", only: :dev, runtime: false},
       {:owl, "~> 0.8", runtime: false},
       {:deep_merge, "~> 1.0"},
-      # {:live_view_native_test, path: "../live_view_native_test", only: :test}
-      {:live_view_native_test, github: "liveview-native/live_view_native_test", only: :test}
+      {:live_view_native_test, path: "../live_view_native_test", only: :test}
+      # {:live_view_native_test, github: "liveview-native/live_view_native_test", only: :test}
     ]
   end
 
@@ -112,7 +111,7 @@ defmodule LiveViewNative.MixProject do
   # Hex package configuration
   defp package do
     %{
-      maintainers: ["May Matyi"],
+      maintainers: ["Brian Cardarella"],
       licenses: ["MIT"],
       links: %{
         "GitHub" => @source_url

test/live_view_native/integrations/inline_test.exs

@@ -12,35 +12,35 @@ defmodule LiveViewNative.InlineRenderTest do
   end
 
   test "can render the fallback html inline render", %{conn: conn} do
-    {:ok, lv, _html} = live(conn, "/inline")
+    {:ok, lv, _body} = live(conn, "/inline")
 
     assert lv |> element("#inline") |> render() =~ "original inline HTML works"
   end
 
   test "can render the gameboy format", %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/gameboy")
-    {:ok, lv, _html} = live(conn, "/inline")
+    {:ok, lv, _body} = live(conn, "/inline")
 
     assert lv |> element("gameboy") |> render() =~ "Inline GameBoy Render 100"
   end
 
   test "can render the gameboy format with tv target", %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/gameboy")
-    {:ok, lv, _html} = live(conn, "/inline?target=tv")
+    {:ok, lv, _body} = live(conn, "/inline?_interface[target]=tv")
 
     assert lv |> element("gameboytv") |> render() =~ "TV Target Inline GameBoy Render 100"
   end
 
   test "can render the switch format", %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/switch")
-    {:ok, lv, _html} = live(conn, "/inline")
+    {:ok, lv, _body} = live(conn, "/inline")
 
     assert lv |> element("switch") |> render() =~ "Inline Switch Render 100"
   end
 
   test "can render the switch format with tv target", %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/switch")
-    {:ok, lv, _html} = live(conn, "/inline?target=tv")
+    {:ok, lv, _body} = live(conn, "/inline?_interface[target]=tv")
 
     assert lv |> element("switchtv") |> render() =~ "TV Target Inline Switch Render 100"
   end

test/live_view_native/integrations/template_test.exs

@@ -26,7 +26,7 @@ defmodule LiveViewNative.TemplateRenderTest do
 
   test "can render the gameboy format with tv target", %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/gameboy")
-    {:ok, lv, _html} = live(conn, "/template?target=tv")
+    {:ok, lv, _html} = live(conn, "/template?_interface[target]=tv")
 
     assert lv |> element("gameboytv") |> render() =~ "TV Target Template GameBoy Render 200"
   end
@@ -40,7 +40,7 @@ defmodule LiveViewNative.TemplateRenderTest do
 
   test "can render the switch format with tv target", %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/switch")
-    {:ok, lv, _html} = live(conn, "/template?target=tv")
+    {:ok, lv, _html} = live(conn, "/template?_interface[target]=tv")
 
     assert lv |> element("switchtv") |> render() =~ "TV Target Template Switch Render 200"
   end

test/live_view_native/session_plug_test.exs → test/live_view_native/live_reloader_test.exs

@@ -1,29 +1,22 @@
-defmodule LiveViewNative.SessionPlugTest do
+defmodule LiveViewNative.LiveReloaderTest do
   use ExUnit.Case
 
   import Plug.Test
   import Plug.Conn
 
   defp conn(path) do
     conn(:get, path)
-    |> Plug.Conn.put_private(:phoenix_endpoint, MyApp.Endpoint)
+    |> Plug.Conn.put_private(:phoenix_endpoint, LiveViewNativeTest.Endpoint)
   end
 
   describe "live reloader" do
     test "injects live_reload for LVN requests if configured and injects at the end of the body" do
-      opts = LiveViewNative.SessionPlug.init([])
+      opts = LiveViewNative.LiveReloader.init([])
 
-      # define so it exists
-      :root_layout_native
-
       conn =
         conn("/")
-        |> Map.put(:params, %{"_lvn" => %{"format" => "native"}})
-        |> put_private(:phoenix_format, "html")
-        |> put_private(:phoenix_root_layout, %{
-            "html" => {TestLayout, :root_layout}
-          })
-        |> LiveViewNative.SessionPlug.call(opts)
+        |> Map.put(:query_string, "_format=gameboy")
+        |> LiveViewNative.LiveReloader.call(opts)
         |> send_resp(200, "<Text>Hello, Elixir</Text>")
 
       assert to_string(conn.resp_body) ==

test/support/live/inline_live.ex

@@ -4,7 +4,7 @@ defmodule LiveViewNativeTest.InlineLive.GameBoy do
     as: :render,
     layout: {LiveViewNativeTest.GameBoyLayouts, :app}
 
-  def render(assigns, %{target: "tv"}) do
+  def render(assigns, %{"target" => "tv"}) do
     ~LVN"""
     <GameBoyTV>TV Target Inline GameBoy Render <%= @count %></GameBoyTV>
     """
@@ -23,7 +23,7 @@ defmodule LiveViewNativeTest.InlineLive.Switch do
     as: :render,
     layout: {LiveViewNativeTest.SwitchLayouts, :app}
 
-  def render(assigns, %{target: "tv"}) do
+  def render(assigns, %{"target" => "tv"}) do
     ~LVN"""
     <SwitchTV>TV Target Inline Switch Render <%= @count %></SwitchTV>
     """