Merge pull request #212 from facebook/testAllInput

[AllInput] Followup to #211 add UI testing

src/__tests__/expected/allInputBranch.txt

@@ -0,0 +1,30 @@
+  fix3
+  |===>gh-pages
+* master
+  testAllInput
+  trunk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+________________________________________________________________________________
+[f|A] selection, [down|j|up|k|space|b] navigation, [x] quick select mode, [c] co

src/__tests__/inputs/gitBranch.txt

@@ -0,0 +1,5 @@
+  fix3
+  gh-pages
+* master
+  testAllInput
+  trunk

src/__tests__/screenTestRunner.py

@@ -24,13 +24,14 @@
 INPUT_DIR = './inputs/'
 
 
-def getLineObjsFromFile(inputFile, validateFileExists):
+def getLineObjsFromFile(inputFile, validateFileExists, allInput):
     inputFile = os.path.join(INPUT_DIR, inputFile)
     file = open(inputFile)
     lines = file.read().split('\n')
     file.close()
     return processInput.getLineObjsFromLines(lines,
-                                             validateFileExists=validateFileExists)
+                                             validateFileExists=validateFileExists,
+                                             allInput=allInput)
 
 
 def getRowsFromScreenRun(
@@ -41,10 +42,12 @@ def getRowsFromScreenRun(
         pastScreen=None,
         pastScreens=None,
         validateFileExists=False,
+        allInput=False,
         args=[]):
 
     lineObjs = getLineObjsFromFile(inputFile,
-                                   validateFileExists=validateFileExists)
+                                   validateFileExists=validateFileExists,
+                                   allInput=allInput)
     screen = ScreenForTest(
         charInputs,
         maxX=screenConfig.get('maxX', 80),

src/__tests__/testParsing.py

@@ -375,6 +375,7 @@
         'match': 'no changes added to commit (use "git add" and/or "git commit -a")'
     }]
 
+
 class TestParseFunction(unittest.TestCase):
 
     def testPrependDir(self):
@@ -445,9 +446,10 @@ def testAllInputMatches(self):
 
             (match, _, _) = result
             self.assertEqual(match, testCase['match'], 'Line "%s" did not match.' %
-                            testCase['input'])
+                             testCase['input'])
 
-        print('Tested %d cases for all-input matching.' % len(allInputTestCases))
+        print('Tested %d cases for all-input matching.' %
+              len(allInputTestCases))
 
     def checkFileResult(self, testCase):
         result = parse.matchLine(testCase['input'],

src/__tests__/testScreen.py

@@ -136,6 +136,11 @@
     'name': 'selectAllBug',
     'input': 'gitLongDiff.txt',
     'inputs': ['A'],
+}, {
+    'name': 'allInputBranch',
+    'input': 'gitBranch.txt',
+    'args': ['-ai'],
+    'inputs': ['j', 'f'],
 }]
 
 
@@ -153,15 +158,17 @@ def testScreenInputs(self):
             charInputs = ['q']  # we always quit at the end
             charInputs = testCase.get('inputs', []) + charInputs
 
+            args = testCase.get('args', [])
             screenData = screenTestRunner.getRowsFromScreenRun(
                 inputFile=testCase.get('input', 'gitDiff.txt'),
                 charInputs=charInputs,
                 screenConfig=testCase.get('screenConfig', {}),
                 printScreen=False,
                 pastScreen=testCase.get('pastScreen', None),
                 pastScreens=testCase.get('pastScreens', None),
-                args=testCase.get('args', []),
-                validateFileExists=testCase.get('validateFileExists', False)
+                args=args,
+                validateFileExists=testCase.get('validateFileExists', False),
+                allInput=('-ai' in args or '--all-input' in args),
             )
 
             self.compareToExpected(testCase, testName, screenData)

src/output.py

@@ -150,7 +150,7 @@ def composeFileCommand(command, lineObjs):
     if '$F' in command:
         command = command.replace('$F', path_str)
     else:
-        command = command + ' ' + path_str 
+        command = command + ' ' + path_str
     return command
 
 

src/parse.py

@@ -174,7 +174,8 @@ def matchLine(line, validateFileExists=False, allInput=False):
     if not validateFileExists:
         results = matchLineImpl(line, withAllLinesMatched=allInput)
         return results[0] if results else None
-    results = matchLineImpl(line, withFileInspection=True, withAllLinesMatched=allInput)
+    results = matchLineImpl(
+        line, withFileInspection=True, withAllLinesMatched=allInput)
     if not results:
         return None
     # ok now we are going to check if this result is an actual