diff options
| -rw-r--r-- | cmd2/cmd2.py | 2 | ||||
| -rw-r--r-- | tests/test_cmd2.py | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index a513d0e7..56d74ec8 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -2780,6 +2780,8 @@ class Cmd(cmd.Cmd): try: choice = int(response) + if choice < 1: + raise IndexError result = fulloptions[choice - 1][0] break except (ValueError, IndexError): diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index 57e1e90f..18cd16e6 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -1344,7 +1344,7 @@ def test_select_options(select_app): # And verify the expected output to stdout assert out == expected -def test_select_invalid_option(select_app): +def test_select_invalid_option_too_big(select_app): # Mock out the input call so we don't actually wait for a user's response on stdin m = mock.MagicMock(name='input') # If side_effect is an iterable then each call to the mock will return the next value from the iterable. @@ -1368,6 +1368,30 @@ def test_select_invalid_option(select_app): # And verify the expected output to stdout assert out == expected +def test_select_invalid_option_too_small(select_app): + # Mock out the input call so we don't actually wait for a user's response on stdin + m = mock.MagicMock(name='input') + # If side_effect is an iterable then each call to the mock will return the next value from the iterable. + m.side_effect = ['0', '1'] # First pass and invalid selection, then pass a valid one + builtins.input = m + + food = 'fish' + out = run_cmd(select_app, "eat {}".format(food)) + expected = normalize(""" + 1. sweet + 2. salty +'0' isn't a valid choice. Pick a number between 1 and 2: +{} with sweet sauce, yum! +""".format(food)) + + # Make sure our mock was called exactly twice with the expected arguments + arg = 'Sauce? ' + calls = [mock.call(arg), mock.call(arg)] + m.assert_has_calls(calls) + + # And verify the expected output to stdout + assert out == expected + def test_select_list_of_strings(select_app): # Mock out the input call so we don't actually wait for a user's response on stdin m = mock.MagicMock(name='input', return_value='2') |