Merge pull request #1000 from dawran6/issue-202

Wrap click.Choice's missing message
pallets · May 16, 2018 · f27a8df · f27a8df
2 parents 4861896 + 7214afe
commit f27a8df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/click/types.py b/click/types.py
@@ -147,7 +147,7 @@ def get_metavar(self, param):
         return '[%s]' % '|'.join(self.choices)
 
     def get_missing_message(self, param):
-        return 'Choose from %s.' % ', '.join(self.choices)
+        return 'Choose from:\n\t%s.' % ',\n\t'.join(self.choices)
 
     def convert(self, value, param, ctx):
         # Exact match

diff --git a/tests/test_options.py b/tests/test_options.py
@@ -306,8 +306,11 @@ def cmd(foo):
 
     result = runner.invoke(cmd)
     assert result.exit_code == 2
-    assert 'Error: Missing option "--foo".  Choose from foo, bar.' \
-        in result.output
+    error, separator, choices = result.output.partition('Choose from')
+    assert 'Error: Missing option "--foo". ' in error
+    assert 'Choose from' in separator
+    assert 'foo' in choices
+    assert 'bar' in choices
 
 
 def test_case_insensitive_choice(runner):