From 3a526bc5e4e1a23b635cbf643fdb94193dfbdff5 Mon Sep 17 00:00:00 2001 From: Magnus Wulf Date: Thu, 9 Apr 2026 13:20:38 +0200 Subject: [PATCH] fix oidcc_plug.gen.controller AuthHTML generation and its testing --- lib/mix/tasks/oidcc_plug.gen.controller.ex | 8 +++----- test/mix/tasks/oidcc_plug.gen.controller_test.exs | 10 ++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/mix/tasks/oidcc_plug.gen.controller.ex b/lib/mix/tasks/oidcc_plug.gen.controller.ex index 6284528..2c1b0d1 100644 --- a/lib/mix/tasks/oidcc_plug.gen.controller.ex +++ b/lib/mix/tasks/oidcc_plug.gen.controller.ex @@ -172,7 +172,7 @@ case Code.ensure_loaded(Igniter.Mix.Task) do |> inspect() |> String.trim_trailing("Controller") |> Kernel.<>("HTML") - |> then(&Module.module_name(igniter, &1)) + |> Module.parse() html_path = html_module_name |> inspect() |> String.split(".") |> List.last() |> Macro.underscore() @@ -270,11 +270,9 @@ case Code.ensure_loaded(Igniter.Mix.Task) do html_module_name, Sourceror.to_string( quote do - defmodule unquote(html_module_name) do - use unquote(web_module), :html + use unquote(web_module), :html - embed_templates(unquote("#{html_path}/*")) - end + embed_templates(unquote("#{html_path}/*")) end ) ) diff --git a/test/mix/tasks/oidcc_plug.gen.controller_test.exs b/test/mix/tasks/oidcc_plug.gen.controller_test.exs index 67dac58..e00a66b 100644 --- a/test/mix/tasks/oidcc_plug.gen.controller_test.exs +++ b/test/mix/tasks/oidcc_plug.gen.controller_test.exs @@ -56,12 +56,10 @@ defmodule OidccPlug.Gen.ControllerTest do | Test.Repo, ...| """) - |> assert_has_patch("lib/test/test_web/auth_html.ex", """ - |defmodule Test.TestWeb.AuthHTML do - | defmodule Test.TestWeb.AuthHTML do - | use TestWeb, :html - | embed_templates("auth_html/*") - | end + |> assert_has_patch("lib/test_web/controllers/auth_html.ex", """ + |defmodule TestWeb.AuthHTML do + | use TestWeb, :html + | embed_templates("auth_html/*") |end | """)