Update tests for -z

swap \n to \x00 and the spaces in detailed log to tabs.

Author: ianhi

jupyterlab_git/tests/test_detailed_log.py

@@ -17,18 +17,18 @@ async def test_detailed_log():
         # Given
         process_output = [
             "f29660a (HEAD, origin/feature) Commit message",
-            "10      3       notebook_without_spaces.ipynb",
-            "11      4       Notebook with spaces.ipynb",
-            "12      5       path/notebook_without_spaces.ipynb",
-            "13      6       path/Notebook with spaces.ipynb",
+            "10\t3\tnotebook_without_spaces.ipynb",
+            "11\t4\tNotebook with spaces.ipynb",
+            "12\t5\tpath/notebook_without_spaces.ipynb",
+            "13\t6\tpath/Notebook with spaces.ipynb",
             " notebook_without_spaces.ipynb      | 13 ++++++++---",
             " Notebook with spaces.ipynb         | 15 +++++++++----",
             " path/notebook_without_spaces.ipynb | 17 ++++++++++-----",
             " path/Notebook with spaces.ipynb    | 19 +++++++++++------",
             " 4 files changed, 46 insertions(+), 18 deletions(-)",
         ]
         mock_execute.return_value = tornado.gen.maybe_future(
-            (0, "\n".join(process_output), "")
+            (0, "\x00".join(process_output), "")
         )
 
         expected_response = {
@@ -83,6 +83,7 @@ async def test_detailed_log():
                 "--stat",
                 "--numstat",
                 "--oneline",
+                "-z",
                 "f29660a2472e24164906af8653babeb48e4bf2ab",
             ],
             cwd=os.path.join("/bin", "test_curr_path"),

jupyterlab_git/tests/test_diff.py

@@ -24,7 +24,7 @@ async def test_changed_files_single_commit():
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         mock_execute.return_value = tornado.gen.maybe_future(
-            (0, "file1.ipynb\nfile2.py", "")
+            (0, "file1.ipynb\x00file2.py", "")
         )
 
         # When
@@ -39,6 +39,7 @@ async def test_changed_files_single_commit():
                 "diff",
                 "64950a634cd11d1a01ddfedaeffed67b531cb11e^!",
                 "--name-only",
+                "-z",
             ],
             cwd="/bin",
         )
@@ -50,7 +51,7 @@ async def test_changed_files_working_tree():
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         mock_execute.return_value = tornado.gen.maybe_future(
-            (0, "file1.ipynb\nfile2.py", "")
+            (0, "file1.ipynb\x00file2.py", "")
         )
 
         # When
@@ -60,7 +61,7 @@ async def test_changed_files_working_tree():
 
         # Then
         mock_execute.assert_called_once_with(
-            ["git", "diff", "HEAD", "--name-only"], cwd="/bin"
+            ["git", "diff", "HEAD", "--name-only", "-z"], cwd="/bin"
         )
         assert {"code": 0, "files": ["file1.ipynb", "file2.py"]} == actual_response
 
@@ -70,7 +71,7 @@ async def test_changed_files_index():
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         mock_execute.return_value = tornado.gen.maybe_future(
-            (0, "file1.ipynb\nfile2.py", "")
+            (0, "file1.ipynb\x00file2.py", "")
         )
 
         # When
@@ -80,7 +81,7 @@ async def test_changed_files_index():
 
         # Then
         mock_execute.assert_called_once_with(
-            ["git", "diff", "--staged", "HEAD", "--name-only"], cwd="/bin"
+            ["git", "diff", "--staged", "HEAD", "--name-only", "-z"], cwd="/bin"
         )
         assert {"code": 0, "files": ["file1.ipynb", "file2.py"]} == actual_response
 
@@ -90,7 +91,7 @@ async def test_changed_files_two_commits():
     with patch("jupyterlab_git.git.execute") as mock_execute:
         # Given
         mock_execute.return_value = tornado.gen.maybe_future(
-            (0, "file1.ipynb\nfile2.py", "")
+            (0, "file1.ipynb\x00file2.py", "")
         )
 
         # When
@@ -100,7 +101,7 @@ async def test_changed_files_two_commits():
 
         # Then
         mock_execute.assert_called_once_with(
-            ["git", "diff", "HEAD", "origin/HEAD", "--name-only"], cwd="/bin"
+            ["git", "diff", "HEAD", "origin/HEAD", "--name-only", "-z"], cwd="/bin"
         )
         assert {"code": 0, "files": ["file1.ipynb", "file2.py"]} == actual_response
 
@@ -118,6 +119,6 @@ async def test_changed_files_git_diff_error():
 
         # Then
         mock_execute.assert_called_once_with(
-            ["git", "diff", "HEAD", "origin/HEAD", "--name-only"], cwd="/bin"
+            ["git", "diff", "HEAD", "origin/HEAD", "--name-only", "-z"], cwd="/bin"
         )
         assert {"code": 128, "message": "error message"} == actual_response