Merge branch 'apb/error-pages' of https://github.com/BeaconCMS/beacon …

…into apb/error-pages

lib/beacon/loader/error_module_loader.ex

@@ -43,7 +43,6 @@ defmodule Beacon.Loader.ErrorModuleLoader do
       end
 
     :ok = Loader.reload_module!(error_module, ast)
-
     {:ok, error_module, ast}
   end
 

test/beacon/loader/error_module_loader_test.exs

@@ -26,6 +26,7 @@ defmodule Beacon.Loader.ErrorModuleLoaderTest do
   end
 
   setup %{conn: conn} do
+    component_fixture(site: @site)
     :ok = Beacon.Loader.populate_layouts(@site)
     :ok = Beacon.Loader.populate_error_pages(@site)
     error_module = load_error_pages_module(@site)
@@ -69,6 +70,22 @@ defmodule Beacon.Loader.ErrorModuleLoaderTest do
     assert error_module.layout(501, %{inner_content: error_page.template}) == {:safe, ["#custom_layout#", "error_501"]}
   end
 
+  test "user-defined component in layout" do
+    layout = published_layout_fixture(template: ~S|<%= my_component("sample_component", val: 1 )%><%= @inner_content %>|, site: @site)
+    error_page = error_page_fixture(layout: layout, template: "error", status: 502, site: @site)
+    error_module = load_error_pages_module(@site)
+
+    assert error_module.layout(502, %{inner_content: error_page.template}) == {:safe, ["1", "error"]}
+  end
+
+  test "user-defined component in page" do
+    layout = published_layout_fixture(template: ~S|<%= @inner_content %>|, site: @site)
+    error_page = error_page_fixture(layout: layout, template: ~S|<%= my_component("sample_component", val: 1) %>|, status: 503, site: @site)
+    error_module = load_error_pages_module(@site)
+
+    assert error_module.layout(503, %{inner_content: error_page.template}) == {:safe, ["1", "error"]}
+  end
+
   test "default error pages", %{conn: conn, error_module: error_module} do
     expected =
       ~S"""