Merge pull request #65 from dwhswenson/wizard-empty-input

Wizard: Fix uncaught exception if user input is empty

Author: dwhswenson

paths_cli/tests/wizard/test_wizard.py

@@ -81,6 +81,20 @@ def helper(result):
         assert result == 'foo'
         assert 'You said: helpme' in console.log_text
 
+    @pytest.mark.parametrize('autohelp', [True, False])
+    def test_ask_empty(self, autohelp):
+        # if the use response in an empty string, we should repeat the
+        # question (possible giving autohelp). This fixes a regression where
+        # an empty string would cause an uncaught exception.
+        console = MockConsole(['', 'foo'])
+        self.wizard.console = console
+        result = self.wizard.ask("question",
+                                 helper=lambda x: "say_help",
+                                 autohelp=autohelp)
+        assert result == "foo"
+        if autohelp:
+            assert "say_help" in self.wizard.console.log_text
+
     def _generic_speak_test(self, func_name):
         console = MockConsole()
         self.wizard.console = console

paths_cli/wizard/wizard.py

@@ -85,6 +85,11 @@ def ask(self, question, options=None, default=None, helper=None,
             helper = Helper(helper)
         result = self.console.input("🧙 " + question + " ")
         self.console.print()
+        if result == "":
+            if not autohelp:
+                return
+            result = "?"  # autohelp in this case
+
         if helper and result[0] in ["?", "!"]:
             self.say(helper(result))
             return