test: add kbi_msg=None tests and restore previous typing imports

This commit adds tests to the `Form` `Prompt` and `Question` classes
to ensure no message is printed when a KeyboardInterrupt is raised
during an `ask()`/`ask_async()` call where `kbi_msg=None`.

Author: Sevrain1

questionary/form.py

@@ -1,8 +1,8 @@
-from typing import TYPE_CHECKING
+from typing import Any
+from typing import Dict
 from typing import NamedTuple
-
-if TYPE_CHECKING:
-    from typing import Any, Dict, Sequence, Union
+from typing import Sequence
+from typing import Union
 
 from questionary.constants import DEFAULT_KBI_MESSAGE
 from questionary.question import Question

questionary/prompt.py

@@ -1,8 +1,10 @@
-from typing import TYPE_CHECKING
+from typing import Any
 from typing import Callable
-
-if TYPE_CHECKING:
-    from typing import Any, Dict, Iterable, Mapping, Optional, Union
+from typing import Dict
+from typing import Iterable
+from typing import Mapping
+from typing import Optional
+from typing import Union
 
 from prompt_toolkit.output import ColorDepth
 

questionary/question.py

@@ -1,9 +1,6 @@
 import sys
-from typing import TYPE_CHECKING
 from typing import Any
-
-if TYPE_CHECKING:
-    from typing import Union
+from typing import Union
 
 import prompt_toolkit.patch_stdout
 from prompt_toolkit import Application

tests/test_form.py

@@ -1,3 +1,6 @@
+import asyncio
+from unittest.mock import patch
+
 from prompt_toolkit.output import DummyOutput
 from pytest import fail
 
@@ -77,3 +80,37 @@ def run(inp):
             fail("Keyboard Interrupt should be caught by `ask()`")
 
     execute_with_input_pipe(run)
+
+
+def test_no_keyboard_interrupt_message_in_ask() -> None:
+    """
+    Test no message printed when `kbi_msg` is None in `ask()`.
+    """
+    def run(inp):
+        inp.send_text(KeyInputs.CONTROLC)
+        f = example_form(inp)
+
+        with patch("builtins.print") as mock_print:
+            result = f.ask(kbi_msg=None)
+
+        mock_print.assert_not_called()
+        assert result == {}
+
+    execute_with_input_pipe(run)
+
+
+def test_no_keyboard_interrupt_message_in_ask_async() -> None:
+    """
+    Test no message printed when `kbi_msg` is None in `ask_async()`.
+    """
+    def run(inp):
+        inp.send_text(KeyInputs.CONTROLC)
+        f = example_form(inp)
+
+        with patch("builtins.print") as mock_print:
+            result = asyncio.run(f.ask_async(kbi_msg=None))
+
+        mock_print.assert_not_called()
+        assert result == {}
+
+    execute_with_input_pipe(run)

tests/test_prompt.py

@@ -1,7 +1,11 @@
+import asyncio
+from unittest.mock import patch
+
 import pytest
 
 from questionary.prompt import PromptParameterException
 from questionary.prompt import prompt
+from questionary.prompt import prompt_async
 from tests.utils import patched_prompt
 
 
@@ -76,3 +80,53 @@ def test_print_with_name():
     questions = [{"name": "hello", "type": "print", "message": "Hello World"}]
     result = patched_prompt(questions, "")
     assert result == {"hello": None}
+
+
+@patch("builtins.print")
+@patch("questionary.prompt.unsafe_prompt", side_effect=KeyboardInterrupt)
+def test_no_keyboard_interrupt_message_in_prompt(
+    mock_unsafe_prompt, mock_print
+) -> None:
+    """
+    Test no message printed when `kbi_msg` is None in `prompt()`.
+
+    Args:
+        mock_unsafe_prompt: A mock of the internal `unsafe_prompt()` call.
+            raises a KeyboardInterrupt.
+
+        mock_print: A mock of Python's builtin `print()` function.
+    """
+    # Act
+    result = prompt(questions={}, kbi_msg=None)
+
+    # Verify internal functions were properly called
+    mock_unsafe_prompt.assert_called_once()  # Raises KeyboardInterrupt
+    mock_print.assert_not_called()
+
+    # Verify result
+    assert result == {}
+
+
+@patch("builtins.print")
+@patch("questionary.prompt.unsafe_prompt_async", side_effect=KeyboardInterrupt)
+def test_no_keyboard_interrupt_message_in_prompt_async(
+    mock_unsafe_prompt_async, mock_print
+) -> None:
+    """
+    Test no message printed when `kbi_msg` is None in `prompt_async()`.
+
+    Args:
+        mock_unsafe_prompt_async: A mock of the internal `unsafe_prompt_async()` call.
+            raises a KeyboardInterrupt.
+
+        mock_print: A mock of Python's builtin `print()` function.
+    """
+    # Act
+    result = asyncio.run(prompt_async(questions={}, kbi_msg=None))
+
+    # Verify internal functions were properly called
+    mock_unsafe_prompt_async.assert_called_once()  # Raises KeyboardInterrupt
+    mock_print.assert_not_called()
+
+    # Verify result
+    assert result == {}

tests/test_question.py

@@ -1,5 +1,6 @@
 import asyncio
 import platform
+from unittest.mock import patch
 
 import pytest
 from prompt_toolkit.output import DummyOutput
@@ -94,3 +95,37 @@ def run(inp):
         assert response == "Hello\nworld"
 
     execute_with_input_pipe(run)
+
+
+def test_no_keyboard_interrupt_message_in_ask():
+    """
+    Test no message printed when `kbi_msg` is None in `ask()`.
+    """
+    def run(inp):
+        inp.send_text(KeyInputs.CONTROLC)
+        question = text("Hello?", input=inp, output=DummyOutput())
+
+        with patch("builtins.print") as mock_print:
+            result = question.ask(kbi_msg=None)
+
+        mock_print.assert_not_called()
+        assert result is None
+
+    execute_with_input_pipe(run)
+
+
+def test_no_keyboard_interrupt_message_in_ask_async():
+    """
+    Test no message printed when `kbi_msg` is None in `ask_async()`.
+    """
+    def run(inp):
+        inp.send_text(KeyInputs.CONTROLC)
+        question = text("Hello?", input=inp, output=DummyOutput())
+
+        with patch("builtins.print") as mock_print:
+            result = asyncio.run(question.ask_async(kbi_msg=None))
+
+        mock_print.assert_not_called()
+        assert result is None
+
+    execute_with_input_pipe(run)