From 0aaf96bce45fd70e8f89d5d660238b1a43cae049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saugat=20Pachhai=20=28=E0=A4=B8=E0=A5=8C=E0=A4=97=E0=A4=BE?= =?UTF-8?q?=E0=A4=A4=29?= Date: Mon, 22 Nov 2021 17:18:01 +0545 Subject: [PATCH] exp init: show 'n to omit' on --explicit mode --- dvc/ui/prompt.py | 6 ++++-- tests/unit/ui/test_prompt.py | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dvc/ui/prompt.py b/dvc/ui/prompt.py index 7943584b8..71e5dd1d5 100644 --- a/dvc/ui/prompt.py +++ b/dvc/ui/prompt.py @@ -152,10 +152,12 @@ class Prompt(RichInputMixin, rich.prompt.Prompt): _default = self.render_default(default) parts.append(_default) - if self.allow_omission and parts: + if self.allow_omission: from rich.text import Text - parts.append(Text(f", {self.omit_value} to omit", style="italic")) + if parts: + parts.append(", ") + parts.append(Text(f"{self.omit_value} to omit", style="italic")) if parts: parts = [" [", *parts, "]"] diff --git a/tests/unit/ui/test_prompt.py b/tests/unit/ui/test_prompt.py index 9a0f6c9ad..2b806c3a5 100644 --- a/tests/unit/ui/test_prompt.py +++ b/tests/unit/ui/test_prompt.py @@ -51,7 +51,11 @@ def test_prompt_disallows_empty_response(mocker): assert console.file.getvalue() == expected -def test_prompt_with_conditional_skip(mocker): +@pytest.mark.parametrize("default, brack", [ + ("default", "[default, n to omit]"), + (None, "[n to omit]"), +]) +def test_prompt_with_conditional_skip(mocker, default, brack): console = RichConsole(file=io.StringIO()) mocked_validator = mocker.MagicMock(return_value="something") assert ( @@ -60,13 +64,13 @@ def test_prompt_with_conditional_skip(mocker): console=console, allow_omission=True, stream=io.StringIO("n\n"), - default="default", + default=default, validator=mocked_validator, ) is None ) assert ( - console.file.getvalue() == "What is your name? [default, n to omit]: " + console.file.getvalue() == f"What is your name? {brack}: " ) mocked_validator.assert_not_called()