Fix unit tests

Author: fcollonval

jupyterlab_git/git.py

@@ -271,7 +271,7 @@ async def status(self, current_path):
         are_binary = dict()
         if text_code == 0:
             for line in filter(lambda l: len(l) > 0, strip_and_split(text_output)):
-                diff, name = line.rsplit(maxsplit=1)
+                diff, name = line.rsplit("\t", maxsplit=1)
                 are_binary[name] = diff.startswith("-\t-")
 
         result = []
@@ -345,23 +345,12 @@ async def detailed_log(self, selected_hash, current_path):
         if code != 0:
             return {"code": code, "command": " ".join(cmd), "message": my_error}
 
-        # Test for binary file
-        command = ["git", "diff", "--numstat", "-z", "4b825dc642cb6eb9a060e54bf8d69288fbee4904", selected_hash]
-        text_code, text_output, _ = await execute(
-            command, 
-            cwd=os.path.join(self.root_dir, current_path),
-        )
-        are_binary = dict()
-        if text_code == 0:
-            for line in filter(lambda l: len(l) > 0, strip_and_split(text_output)):
-                diff, name = line.rsplit(maxsplit=1)
-                are_binary[name] = diff.startswith("-\t-")
-
         total_insertions = 0
         total_deletions = 0
         result = []
         line_iterable = iter(strip_and_split(my_output)[1:])
         for line in line_iterable:
+            is_binary = line.startswith("-\t-\t")
             insertions, deletions, file = line.split('\t')
             insertions = insertions.replace('-', '0')
             deletions = deletions.replace('-', '0')
@@ -372,11 +361,9 @@ async def detailed_log(self, selected_hash, current_path):
                 to_path = next(line_iterable)
                 modified_file_name = from_path + " => " + to_path
                 modified_file_path = to_path
-                is_binary = are_binary.get(to_path, None)
             else:
                 modified_file_name = file.split("/")[-1]
                 modified_file_path = file
-                is_binary = are_binary.get(file, None)
 
             result.append({
                 "modified_file_path": modified_file_path,
@@ -1057,9 +1044,7 @@ async def _is_binary(self, filename, ref, top_repo_path):
         else:
             command = ["git", "diff", "--numstat", "4b825dc642cb6eb9a060e54bf8d69288fbee4904", ref, "--", filename]  # where 4b825... is a magic SHA which represents the empty tree
         # code, output, error = await execute(command, cwd=top_repo_path)
-        r = await execute(command, cwd=top_repo_path)
-        print(r)
-        code, output, error = r
+        code, output, error = await execute(command, cwd=top_repo_path)
 
         if code != 0:
             err_msg = "fatal: Path '{}' does not exist (neither on disk nor in the index)".format(filename).lower()

jupyterlab_git/tests/test_detailed_log.py

@@ -29,7 +29,7 @@ async def test_detailed_log():
         ]
 
 
-        mock_execute._mock_return_value = maybe_future(
+        mock_execute.return_value = maybe_future(
             (0, "\x00".join(process_output)+"\x00", "")
         )
 
@@ -45,42 +45,49 @@ async def test_detailed_log():
                     "modified_file_name": "notebook_without_spaces.ipynb",
                     "insertion": "10",
                     "deletion": "3",
+                    "is_binary": False,
                 },
                 {
                     "modified_file_path": "Notebook with spaces.ipynb",
                     "modified_file_name": "Notebook with spaces.ipynb",
                     "insertion": "11",
                     "deletion": "4",
+                    "is_binary": False,
                 },
                 {
                     "modified_file_path": "path/notebook_without_spaces.ipynb",
                     "modified_file_name": "notebook_without_spaces.ipynb",
                     "insertion": "12",
                     "deletion": "5",
+                    "is_binary": False,
                 },
                 {
                     "modified_file_path": "path/Notebook with spaces.ipynb",
                     "modified_file_name": "Notebook with spaces.ipynb",
                     "insertion": "13",
                     "deletion": "6",
+                    "is_binary": False,
                 },
                 {
                     "modified_file_path": "path/Notebook with λ.ipynb",
                     "modified_file_name": "Notebook with λ.ipynb",
                     "insertion": "14",
                     "deletion": "1",
+                    "is_binary": False,
                 },
                 {
                     "modified_file_path": "folder2/file with spaces.py",
                     "modified_file_name": "folder1/file with spaces and λ.py => folder2/file with spaces.py",
                     "insertion": "0",
                     "deletion": "0",
+                    "is_binary": False,
                 },
                 {
                     "modified_file_path": "binary_file.png",
                     "modified_file_name": "binary_file.png",
                     "insertion": "0",
                     "deletion": "0",
+                    "is_binary": True,
                 },
             ],
         }

jupyterlab_git/tests/test_status.py

@@ -13,64 +13,97 @@
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
-    "output,expected",
+    "output,diff_output,expected",
     [
         (
             (
                 "A  notebook with spaces.ipynb",
                 "M  notebook with λ.ipynb",
+                "M  binary file.gif",
                 "R  renamed_to_θ.py",
                 "originally_named_π.py",
                 "?? untracked.ipynb",
             ),
+            (
+                "0\t0\tnotebook with spaces.ipynb",
+                "-\t-\tbinary file.gif",
+                "0\t0\trenamed_to_θ.py",
+            ),
             [
                 {
                     "x": "A",
                     "y": " ",
                     "to": "notebook with spaces.ipynb",
                     "from": "notebook with spaces.ipynb",
+                    "is_binary": False,
                 },
                 {
                     "x": "M",
                     "y": " ",
                     "to": "notebook with λ.ipynb",
                     "from": "notebook with λ.ipynb",
+                    "is_binary": None,
+                },
+                {
+                    "x": "M",
+                    "y": " ",
+                    "to": "binary file.gif",
+                    "from": "binary file.gif",
+                    "is_binary": True,
                 },
                 {
                     "x": "R",
                     "y": " ",
                     "to": "renamed_to_θ.py",
                     "from": "originally_named_π.py",
+                    "is_binary": False,
                 },
                 {
                     "x": "?",
                     "y": "?",
                     "to": "untracked.ipynb",
                     "from": "untracked.ipynb",
+                    "is_binary": None,
                 },
             ],
         ),
-        ((""), ([])),  # Empty answer
+        ((""), (""), ([])),  # Empty answer
     ],
 )
-async def test_status(output, expected):
+async def test_status(output, diff_output, expected):
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         root = "/bin"
         repository = "test_curr_path"
-        mock_execute.return_value = maybe_future(
-            (0, "\x00".join(output)+"\x00", "")
-        )
+        mock_execute.side_effect = [
+            maybe_future((0, "\x00".join(output) + "\x00", "")),
+            maybe_future((0, "\x00".join(diff_output) + "\x00", "")),
+        ]
 
         # When
         actual_response = await Git(FakeContentManager(root)).status(
             current_path=repository
         )
 
         # Then
-        mock_execute.assert_called_once_with(
-            ["git", "status", "--porcelain", "-u", "-z"],
-            cwd=os.path.join(root, repository),
+        mock_execute.assert_has_calls(
+            [
+                call(
+                    ["git", "status", "--porcelain", "-u", "-z"],
+                    cwd=os.path.join(root, repository),
+                ),
+                call(
+                    [
+                        "git",
+                        "diff",
+                        "--numstat",
+                        "-z",
+                        "--cached",
+                        "4b825dc642cb6eb9a060e54bf8d69288fbee4904",
+                    ],
+                    cwd=os.path.join(root, repository),
+                ),
+            ]
         )
 
         assert {"code": 0, "files": expected} == actual_response

src/components/diff/PlainTextDiff.tsx

@@ -122,7 +122,8 @@ export class PlainTextDiff extends React.Component<
    * @param currContent the raw value of the current content
    */
   private _addDiffViewer(prevContent: string, currContent: string) {
-    const mode = Mode.findBest(this.props.path);
+    const mode =
+      Mode.findByFileName(this.props.path) || Mode.findBest(this.props.path);
 
     mergeView(this._mergeViewRef.current, {
       value: currContent,

tests/GitExtension.spec.tsx

@@ -190,7 +190,7 @@ describe('IGitExtension', () => {
 
       model.pathRepository = '/path/to/server/repo';
       await model.ready;
-      status = [{ x: '', y: '', from: '', to: '' }];
+      status = [{ x: '', y: '', from: '', to: '', is_binary: null }];
       await model.refreshStatus();
       expect(model.status).toHaveLength(1);
 
@@ -220,7 +220,7 @@ describe('IGitExtension', () => {
 
       model.pathRepository = '/path/to/server/repo';
       await model.ready;
-      status = [{ x: '', y: '', from: '', to: '' }];
+      status = [{ x: '', y: '', from: '', to: '', is_binary: null }];
       await model.refreshStatus();
       await testSignal;
     });

tests/test-components/Diff.spec.tsx

@@ -40,6 +40,6 @@ describe('Diff', () => {
   );
 
   it('should support diffing all files', function() {
-    expect(isDiffSupported('/path/to/script.unk')).toBeTruthy();
+    expect(isDiffSupported('/path/to/script.unk')).toBeFalsy();
   });
 });

tests/test-components/FileItem.spec.tsx

@@ -11,6 +11,7 @@ describe('FileItem', () => {
       y: 'M',
       to: 'some/file/path/file-name',
       from: '',
+      is_binary: null,
       status: null
     },
     model: null,