{@idea.body}
+{@idea.body}
<% end %> <%= if @idea.link do %> diff --git a/lib/mindwendel_web/live/idea_live/show_component.html.heex b/lib/mindwendel_web/live/idea_live/show_component.html.heex index 2e84b304..0efc4c79 100644 --- a/lib/mindwendel_web/live/idea_live/show_component.html.heex +++ b/lib/mindwendel_web/live/idea_live/show_component.html.heex @@ -1,6 +1,6 @@{@idea.body}
+{@idea.body}
<% end %> <%= if @idea.link do %> diff --git a/lib/mindwendel_web/live/lane_live/index_component.html.heex b/lib/mindwendel_web/live/lane_live/index_component.html.heex index 1b927298..99647fca 100644 --- a/lib/mindwendel_web/live/lane_live/index_component.html.heex +++ b/lib/mindwendel_web/live/lane_live/index_component.html.heex @@ -1,134 +1,142 @@ -{gettext("No ideas brainstormed")}
- <.link - class="btn btn-outline-primary d-inline-flex align-items-center" - patch={~p"/brainstormings/#{@brainstorming.id}/lanes/#{lane.id}/new_idea"} - > - {gettext("Add idea")} - -{gettext("No ideas brainstormed")}
+ <.link + class="btn btn-outline-primary d-inline-flex align-items-center" + patch={~p"/brainstormings/#{@brainstorming.id}/lanes/#{lane.id}/new_idea"} + > + {gettext("Add idea")} + +{gettext("No lanes available")}
+ <.link + class="btn btn-outline-primary d-inline-flex align-items-center" + patch={~p"/brainstormings/#{@brainstorming.id}/new_lane"} + > + {gettext("New lane")} +{gettext("No lanes available")}
- <.link - class="btn btn-outline-primary d-inline-flex align-items-center" - patch={~p"/brainstormings/#{@brainstorming.id}/new_lane"} - > - {gettext("New lane")} - -First paragraph
Second paragraph
" }) - # Floki.text with sep: " " should preserve spaces assert changeset.changes.body == "First paragraph Second paragraph" end + test "preserves newlines from plain text input", %{ + brainstorming: brainstorming, + lane: lane + } do + changeset = + Idea.changeset(%Idea{}, %{ + brainstorming_id: brainstorming.id, + lane_id: lane.id, + body: "First paragraph\n\nSecond paragraph" + }) + + assert changeset.changes.body == "First paragraph\n\nSecond paragraph" + end + + test "collapses excessive blank lines", %{ + brainstorming: brainstorming, + lane: lane + } do + changeset = + Idea.changeset(%Idea{}, %{ + brainstorming_id: brainstorming.id, + lane_id: lane.id, + body: "Line 1\n\n\n\n\nLine 2" + }) + + assert changeset.changes.body == "Line 1\n\nLine 2" + end + test "strips HTML when updating an existing idea" do idea = Factory.insert!(:idea, body: "Original text") diff --git a/test/mindwendel/services/chat_completions/chat_completions_service_impl_test.exs b/test/mindwendel/services/chat_completions/chat_completions_service_impl_test.exs index bfe4cbc3..57fbe7a1 100644 --- a/test/mindwendel/services/chat_completions/chat_completions_service_impl_test.exs +++ b/test/mindwendel/services/chat_completions/chat_completions_service_impl_test.exs @@ -6,38 +6,31 @@ defmodule Mindwendel.Services.ChatCompletions.ChatCompletionsServiceImplTest do describe "generate_ideas/1" do setup do - # Configure AI for tests - Application.put_env(:mindwendel, :ai, - enabled: true, - provider: :openai, - model: "gpt-4o-mini", - api_key: "test-key", - token_limit_daily: 1000, - token_limit_hourly: 100, - request_timeout: 60_000 - ) - - on_exit(fn -> - # Restore test config from config/test.exs - Application.put_env(:mindwendel, :ai, - enabled: false, - token_limit_daily: nil, - token_limit_hourly: nil, + Mindwendel.AI.Config.Mock + |> stub(:fetch_ai_config!, fn -> + [ + enabled: true, + provider: :openai, + model: "gpt-4o-mini", + api_key: "test-key", + token_limit_daily: 1000, + token_limit_hourly: 100, + token_reset_hour: 0, request_timeout: 60_000 - ) + ] end) :ok end test "returns error when AI is not enabled" do - Application.put_env(:mindwendel, :ai, enabled: false) + Mindwendel.AI.Config.Mock + |> expect(:fetch_ai_config!, fn -> [enabled: false] end) assert {:error, :ai_not_enabled} = ChatCompletionsServiceImpl.generate_ideas("Test") end test "returns error when daily limit is exceeded" do - # Exceed daily limit {:ok, _} = TokenTrackingService.record_usage(%{total_tokens: 1001}) assert {:error, :daily_limit_exceeded} = @@ -45,7 +38,6 @@ defmodule Mindwendel.Services.ChatCompletions.ChatCompletionsServiceImplTest do end test "returns error when hourly limit is exceeded" do - # Exceed hourly limit {:ok, _} = TokenTrackingService.record_usage(%{total_tokens: 101}) assert {:error, :hourly_limit_exceeded} = @@ -55,38 +47,22 @@ defmodule Mindwendel.Services.ChatCompletions.ChatCompletionsServiceImplTest do describe "enabled?/0" do test "returns true when AI is enabled" do - Application.put_env(:mindwendel, :ai, - enabled: true, - token_limit_daily: nil, - token_limit_hourly: nil - ) + Mindwendel.AI.Config.Mock + |> expect(:fetch_ai_config!, fn -> + [enabled: true, token_limit_daily: nil, token_limit_hourly: nil] + end) assert ChatCompletionsServiceImpl.enabled?() == true end test "returns false when AI is disabled" do - Application.put_env(:mindwendel, :ai, - enabled: false, - token_limit_daily: nil, - token_limit_hourly: nil - ) + Mindwendel.AI.Config.Mock + |> expect(:fetch_ai_config!, fn -> + [enabled: false, token_limit_daily: nil, token_limit_hourly: nil] + end) assert ChatCompletionsServiceImpl.enabled?() == false end - - test "raises ArgumentError when AI config is missing" do - # Temporarily delete config to test error handling - original_config = Application.get_env(:mindwendel, :ai) - Application.delete_env(:mindwendel, :ai) - - # enabled?() should raise because it calls fetch_ai_config!() which uses Application.fetch_env! - assert_raise ArgumentError, fn -> - ChatCompletionsServiceImpl.enabled?() - end - - # Restore config - Application.put_env(:mindwendel, :ai, original_config || [enabled: false]) - end end describe "parse_response/1" do diff --git a/test/mindwendel_web/live/brainstorming_live/show_ai_clustering_test.exs b/test/mindwendel_web/live/brainstorming_live/show_ai_clustering_test.exs index fd6b37ed..c5137731 100644 --- a/test/mindwendel_web/live/brainstorming_live/show_ai_clustering_test.exs +++ b/test/mindwendel_web/live/brainstorming_live/show_ai_clustering_test.exs @@ -10,8 +10,8 @@ defmodule MindwendelWeb.BrainstormingLiveAIClusteringTest do import Mindwendel.BrainstormingsFixtures import Ecto.Query - alias Mindwendel.AI.Schemas.IdeaLabelAssignment alias Mindwendel.Accounts + alias Mindwendel.AI.Schemas.IdeaLabelAssignment alias Mindwendel.Brainstormings alias Mindwendel.Brainstormings.Idea alias Mindwendel.Ideas diff --git a/test/mindwendel_web/live/brainstorming_live_ai_token_limit_test.exs b/test/mindwendel_web/live/brainstorming_live_ai_token_limit_test.exs index 32bbe0dd..9c8ffb5a 100644 --- a/test/mindwendel_web/live/brainstorming_live_ai_token_limit_test.exs +++ b/test/mindwendel_web/live/brainstorming_live_ai_token_limit_test.exs @@ -14,7 +14,6 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do import Mindwendel.BrainstormingsFixtures alias Mindwendel.Accounts - alias Mindwendel.AI.TokenTrackingService describe "AI generation with token limits" do setup do @@ -35,10 +34,8 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do brainstorming: brainstorming, moderating_user: moderating_user } do - # Exceed daily token limit - {:ok, _} = TokenTrackingService.record_usage(%{total_tokens: 1_000_001}) + mock_generate_ideas_error(:daily_limit_exceeded) - # Mount the LiveView with moderating user {:ok, view, _html} = conn |> init_test_session(%{current_user_id: moderating_user.id}) @@ -46,15 +43,12 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do allow_chat_completions(view.pid) - # Trigger AI idea generation view |> element("button[phx-click='generate_ai_ideas']") |> render_click() - # Wait for async message to be processed :timer.sleep(200) - # Verify an error message is displayed (generic error due to mock setup) html = render(view) - assert html =~ "Failed to generate ideas" + assert html =~ "Daily AI token limit exceeded" end test "shows appropriate error message when hourly token limit is exceeded", %{ @@ -62,10 +56,8 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do brainstorming: brainstorming, moderating_user: moderating_user } do - # Exceed hourly token limit - {:ok, _} = TokenTrackingService.record_usage(%{total_tokens: 100_001}) + mock_generate_ideas_error(:hourly_limit_exceeded) - # Mount the LiveView with moderating user {:ok, view, _html} = conn |> init_test_session(%{current_user_id: moderating_user.id}) @@ -73,15 +65,12 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do allow_chat_completions(view.pid) - # Trigger AI idea generation view |> element("button[phx-click='generate_ai_ideas']") |> render_click() - # Wait for async message to be processed :timer.sleep(200) - # Verify an error message is displayed (generic error due to mock setup) html = render(view) - assert html =~ "Failed to generate ideas" + assert html =~ "Hourly AI request limit exceeded" end test "replaces loading message with error when limit is hit", %{ @@ -89,10 +78,8 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do brainstorming: brainstorming, moderating_user: moderating_user } do - # Exceed daily token limit - {:ok, _} = TokenTrackingService.record_usage(%{total_tokens: 1_000_001}) + mock_generate_ideas_error(:daily_limit_exceeded) - # Mount the LiveView with moderating user {:ok, view, _html} = conn |> init_test_session(%{current_user_id: moderating_user.id}) @@ -100,7 +87,6 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do allow_chat_completions(view.pid) - # Trigger AI idea generation click_html = view |> element("button[phx-click='generate_ai_ideas']") @@ -112,9 +98,9 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do # Wait for async message to process :timer.sleep(200) - # Error message should appear (generic error due to mock setup) + # Error message should appear html = render(view) - assert html =~ "Failed to generate ideas" + assert html =~ "Daily AI token limit exceeded" end test "successfully generates ideas when within limits", %{ @@ -122,10 +108,8 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do brainstorming: brainstorming, moderating_user: moderating_user } do - # Mock successful AI generation with 3 ideas mock_generate_ideas(3) - # Mount the LiveView with moderating user {:ok, view, _html} = conn |> init_test_session(%{current_user_id: moderating_user.id}) @@ -133,25 +117,19 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do allow_chat_completions(view.pid) - # Trigger AI idea generation view |> element("button[phx-click='generate_ai_ideas']") |> render_click() - # Wait for async processing :timer.sleep(200) - # Verify success message html = render(view) assert html =~ "idea(s) generated" end test "hides AI button when AI is disabled", %{conn: conn, brainstorming: brainstorming} do - # Disable AI disable_ai() - # Mount the LiveView {:ok, view, _html} = live(conn, ~p"/brainstormings/#{brainstorming.id}") - # Verify AI button is not shown refute view |> has_element?("button[phx-click='generate_ai_ideas']") end end @@ -163,24 +141,19 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock |> stub(:enabled?, fn -> true end) - # Get moderating user from brainstorming moderating_user = List.first(brainstorming.users) Accounts.add_moderating_user(brainstorming, moderating_user) %{brainstorming: brainstorming, moderating_user: moderating_user} end - test "allows generation when at exactly the daily limit minus one", %{ + test "allows generation when within limits", %{ conn: conn, brainstorming: brainstorming, moderating_user: moderating_user } do - # Set usage to just under the limit (999,999 tokens) - {:ok, _} = TokenTrackingService.record_usage(%{total_tokens: 999_999}) - mock_generate_ideas(2) - # Mount the LiveView with moderating user {:ok, view, _html} = conn |> init_test_session(%{current_user_id: moderating_user.id}) @@ -188,27 +161,22 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do allow_chat_completions(view.pid) - # Trigger AI idea generation - should succeed view |> element("button[phx-click='generate_ai_ideas']") |> render_click() - # Wait for async processing :timer.sleep(200) - # Verify success (no error message about limits) html = render(view) refute html =~ "Daily AI token limit exceeded" refute html =~ "Hourly AI request limit exceeded" end - test "blocks generation when at exactly the daily limit", %{ + test "blocks generation when daily limit is reached", %{ conn: conn, brainstorming: brainstorming, moderating_user: moderating_user } do - # Set usage to exactly the limit (1,000,000 tokens) - {:ok, _} = TokenTrackingService.record_usage(%{total_tokens: 1_000_000}) + mock_generate_ideas_error(:daily_limit_exceeded) - # Mount the LiveView with moderating user {:ok, view, _html} = conn |> init_test_session(%{current_user_id: moderating_user.id}) @@ -216,15 +184,12 @@ defmodule MindwendelWeb.BrainstormingLiveAITokenLimitTest do allow_chat_completions(view.pid) - # Trigger AI idea generation - should be blocked view |> element("button[phx-click='generate_ai_ideas']") |> render_click() - # Wait for async processing :timer.sleep(200) - # Verify error message (generic error due to mock setup) html = render(view) - assert html =~ "Failed to generate ideas" + assert html =~ "Daily AI token limit exceeded" end end diff --git a/test/support/chat_completions_case.ex b/test/support/chat_completions_case.ex index c163ed85..1765998b 100644 --- a/test/support/chat_completions_case.ex +++ b/test/support/chat_completions_case.ex @@ -36,6 +36,17 @@ defmodule Mindwendel.ChatCompletionsCase do end defp stub_ai_disabled do + Mindwendel.AI.Config.Mock + |> stub(:fetch_ai_config!, fn -> + [ + enabled: false, + token_limit_daily: nil, + token_limit_hourly: nil, + token_reset_hour: 0, + request_timeout: 60_000 + ] + end) + Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock |> stub(:enabled?, fn -> false end) |> stub(:generate_ideas, fn _title, _lanes, _existing_ideas, _locale -> diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex index 45c88743..8a0b2e65 100644 --- a/test/support/conn_case.ex +++ b/test/support/conn_case.ex @@ -56,6 +56,17 @@ defmodule MindwendelWeb.ConnCase do # Provide default AI disabled stub for all ConnCase tests # This prevents Mox.UnexpectedCallError when LiveViews render defp setup_ai_disabled_stub(_context) do + Mindwendel.AI.Config.Mock + |> Mox.stub(:fetch_ai_config!, fn -> + [ + enabled: false, + token_limit_daily: nil, + token_limit_hourly: nil, + token_reset_hour: 0, + request_timeout: 60_000 + ] + end) + Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock |> Mox.stub(:enabled?, fn -> false end) |> Mox.stub(:generate_ideas, fn _title, _lanes, _existing_ideas, _locale -> diff --git a/test/support/data_case.ex b/test/support/data_case.ex index 5fd71dc9..fda7678b 100644 --- a/test/support/data_case.ex +++ b/test/support/data_case.ex @@ -48,6 +48,17 @@ defmodule Mindwendel.DataCase do # Provide default AI disabled stub for all DataCase tests defp setup_ai_disabled_stub(_context) do + Mindwendel.AI.Config.Mock + |> Mox.stub(:fetch_ai_config!, fn -> + [ + enabled: false, + token_limit_daily: nil, + token_limit_hourly: nil, + token_reset_hour: 0, + request_timeout: 60_000 + ] + end) + Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock |> Mox.stub(:enabled?, fn -> false end) |> Mox.stub(:generate_ideas, fn _title, _lanes, _existing_ideas, _locale -> diff --git a/test/test_helper.exs b/test/test_helper.exs index 851d577d..2ac864a7 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -5,15 +5,19 @@ Ecto.Adapters.SQL.Sandbox.mode(Mindwendel.Repo, :manual) upload_path = "priv/static/uploads/" File.mkdir_p!(Path.dirname(upload_path)) -# Define the mock - it will be configured per-test via test case setups +# Define mocks - they will be configured per-test via test case setups Mox.defmock(Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock, for: Mindwendel.Services.ChatCompletions.ChatCompletionsService ) -# Configure to use the mock in tests +Mox.defmock(Mindwendel.AI.Config.Mock, for: Mindwendel.AI.Config) + +# Configure to use mocks in tests # Each test case (ChatCompletionsCase, ConnCase, DataCase) will set up appropriate stubs/expectations Application.put_env( :mindwendel, :chat_completions_service, Mindwendel.Services.ChatCompletions.ChatCompletionsServiceMock ) + +Application.put_env(:mindwendel, :ai_config_service, Mindwendel.AI.Config.Mock)