Merge pull request #106 from facebook/addCommandModeTest

Add command mode test

Author: pcottle

src/__tests__/expected/selectCommandWithPassedCommand.txt

@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+Oh no! You already provided a command so you cannot enter command mode.
+The command you provided was " 'git add'" 
+Press any key to go back to selecting files.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+________________________________________________________________________________
+[f|A] selection, [down|j|up|k|space|b] navigation, [enter] open, [c] command mod

src/__tests__/screenTestRunner.py

@@ -36,15 +36,17 @@ def getRowsFromScreenRun(
         charInputs,
         screenConfig={},
         printScreen=True,
-        pastScreen=None):
+        pastScreen=None,
+        args=[]):
+
     lineObjs = getLineObjsFromFile(inputFile)
     screen = ScreenForTest(
         charInputs,
         maxX=screenConfig.get('maxX', 80),
         maxY=screenConfig.get('maxY', 30),
     )
-    # mock our flags with an empty command line for now
-    flags = ScreenFlags.initFromArgs([])
+    # mock our flags with the passed arg list
+    flags = ScreenFlags.initFromArgs(args)
     try:
         choose.doProgram(screen, flags, CursesForTest(), lineObjs)
     except StopIteration:

src/__tests__/testScreen.py

@@ -37,6 +37,14 @@
     'input': 'absoluteGitDiff.txt',
     'inputs': ['f', 'j', 'f', 'c'],
     'pastScreen': 1
+}, {
+    'name': 'selectCommandWithPassedCommand',
+    'input': 'absoluteGitDiff.txt',
+    # the last key "a" is so we quit from command mode
+    # after seeing the warning
+    'inputs': ['f', 'c', 'a'],
+    'pastScreen': 1,
+    'args': ["-c 'git add'"]
 }]
 
 
@@ -59,6 +67,7 @@ def testScreenInputs(self):
                 screenConfig=testCase.get('screenConfig', {}),
                 printScreen=False,
                 pastScreen=testCase.get('pastScreen', None),
+                args=testCase.get('args', [])
             )
             self.compareToExpected(testName, actualLines)
             print('Tested %s ' % testName)