Increase test coverage.

Author: domdfcoding

consolekit/_readline.py

@@ -1,9 +1,7 @@
-# pragma: no cover
-
 # stdlib
 import sys
 
-if not bool(getattr(sys, "ps1", sys.flags.interactive)):
+if not bool(getattr(sys, "ps1", sys.flags.interactive)):  # pragma: no cover
 
 	try:
 		# stdlib

tests/test_commands.py

@@ -80,6 +80,7 @@ def demo() -> None:
 		* ~~The other~~ (deprecated)
 		"""
 
+	@colour_option()
 	@demo.command(cls=consolekit.commands.MarkdownHelpCommand)
 	def foo() -> None:
 		"""
@@ -207,6 +208,9 @@ def test_markdown_help_group(
 	result = cli_runner.invoke(demo_command, args=["--help"], color=True)
 	result.check_stdout(advanced_file_regression, extension="_command.md")
 
+	result = cli_runner.invoke(demo_command, args=["--no-colour", "--help"], color=True)
+	result.check_stdout(advanced_file_regression, extension="_command_no_colour.md")
+
 
 @pytest.mark.usefixtures("force_not_pycharm")
 @not_windows("Windows support for bold and italics is non-existent.")

tests/test_commands_/test_markdown_help_group_command.md

@@ -8,4 +8,5 @@ Usage: foo [OPTIONS]
    * T̶h̶e̶ ̶o̶t̶h̶e̶r̶ (deprecated)
 
 Options:
-  --help  Show this message and exit.
+  --colour / --no-colour  Whether to use coloured output.
+  --help                  Show this message and exit.

tests/test_commands_/test_markdown_help_group_command_no_colour.md

@@ -0,0 +1,12 @@
+Usage: foo [OPTIONS]
+
+  This is the summary line.
+
+  This program does the 'following':
+   * This
+   * That
+   * The other (deprecated)
+
+Options:
+  --colour / --no-colour  Whether to use coloured output.
+  --help                  Show this message and exit.

tests/test_input.py

@@ -1,4 +1,5 @@
 # stdlib
+import sys
 from typing import Type
 
 # 3rd party
@@ -145,6 +146,49 @@ def fake_input(prompt: str) -> str:
 	advanced_data_regression.check(list(StringList(capsys.readouterr().out.splitlines())))
 
 
+def test_prompt_err(
+		capsys,
+		monkeypatch,
+		advanced_data_regression: AdvancedDataRegressionFixture,
+		):
+
+	inputs = iter([
+			'',
+			'',
+			'',
+			'',
+			"24",
+			"Bond007",
+			"badpassword",
+			"baspassword",
+			"badpassword",
+			"badpassword",
+			"badpassword",
+			"badpassword",
+			])
+
+	class FakeInput:
+
+		def readline(self) -> str:
+			value = next(inputs)
+			return value + '\n'
+
+	monkeypatch.setattr(sys, "stdin", FakeInput())
+
+	assert prompt(text="What is your age", prompt_suffix="? ", type=click.INT, err=True) == 24
+
+	assert prompt(text="Username", type=click.STRING, err=True) == "Bond007"
+	assert prompt(text="Password", type=click.STRING, confirmation_prompt=True, err=True) == "badpassword"
+	assert prompt(
+			text="Password",
+			type=click.STRING,
+			confirmation_prompt="Are you sure about that? ",
+			err=True,
+			) == "badpassword"
+
+	advanced_data_regression.check(list(StringList(capsys.readouterr().err.splitlines())))
+
+
 @pytest.mark.parametrize("exception", [KeyboardInterrupt, EOFError])
 def test_prompt_abort(
 		capsys,

tests/test_input_/test_prompt_err.yml

@@ -0,0 +1,4 @@
+- 'What is your age? What is your age? What is your age? What is your age? What is
+  your age? Username: Password: Repeat for confirmation: Error: the two entered values
+  do not match'
+- 'Password: Repeat for confirmation: Password: Are you sure about that?'

tests/test_input_/test_prompt_hidden.yml

@@ -0,0 +1,13 @@
+- What is your age?
+- What is your age?
+- What is your age?
+- What is your age?
+- What is your age? 24
+- 'Username: Bond007'
+- 'Password: badpassword'
+- 'Repeat for confirmation: baspassword'
+- 'Error: the two entered values do not match'
+- 'Password: badpassword'
+- 'Repeat for confirmation: badpassword'
+- 'Password: badpassword'
+- Are you sure about that? badpassword

tests/test_options.py

@@ -1,6 +1,6 @@
 # stdlib
 import sys
-from typing import Iterable
+from typing import Iterable, List
 
 # 3rd party
 import click
@@ -10,6 +10,7 @@
 
 # this package
 from consolekit import click_command
+import consolekit
 from consolekit.options import (
 		ChoiceOption,
 		DescribedArgument,
@@ -353,7 +354,7 @@ def test_lazy_choice(
 		cli_runner: CliRunner,
 		):
 
-	def expensive_operation():
+	def expensive_operation() -> List[str]:
 		print("Performing expensive operation to get choices.")
 		return ["Radio 1", "Radio 2", "Radio 3"]
 
@@ -422,6 +423,26 @@ def main(station: str) -> None:
 	assert result.exit_code == 0
 	assert result.stdout.rstrip() == "Tuning to station: Radio 1"
 
+	@consolekit.option(
+			"-s",
+			"--station",
+			help="The station to play.",
+			type=click.Choice(["Radio 1", "Radio 2", "Radio 3"], case_sensitive=False),
+			cls=PromptOption,
+			prompt="Select a station",
+			)
+	@click_command()
+	def main2(station: str) -> None:
+		print(f"Tuning to station: {station}")
+
+	result = cli_runner.invoke(main2, input="Radio 4\nRadio 2\n")
+	assert result.exit_code == 0
+	advanced_file_regression.check(result.stdout.rstrip())
+
+	result = cli_runner.invoke(main2, args=["--station", "Radio 1"])
+	assert result.exit_code == 0
+	assert result.stdout.rstrip() == "Tuning to station: Radio 1"
+
 
 @pytest.mark.parametrize(
 		"click_version",