Merge pull request #438 from fcollonval/408-model-vue

Rework frontend

Author: telamonian

.gitignore

@@ -107,3 +107,4 @@ node_modules/
 package-lock.json
 MANIFEST
 jupyterlab_git/labextension/*.tgz
+*.tsbuildinfo

.travis.yml

@@ -7,10 +7,12 @@ cache:
     - /home/travis/.yarn-cache/
 before_install:
   - nvm install 10
-install: pip install pytest "jupyterlab~=1.0"
+install: pip install pytest "jupyterlab~=1.1"
 script:
   - python setup.py sdist
+  # Install the extension ensuring the cache is unused
   - pip install jupyterlab_git[test] --pre --no-index --find-links=dist --no-deps --no-cache-dir -v
+  # Install the extension dependencies
   - pip install jupyterlab_git[test]
   - jupyter labextension list
   - jupyter lab build

jest.config.js

@@ -1,3 +1,9 @@
+var tsConfig = require ('./tsconfig.json');
+
+var tsOptions = tsConfig["compilerOptions"];
+// Need as the test folder is not visible from the src folder
+tsOptions["rootDir"] = null;
+
 module.exports = {
   automock: false,
   moduleNameMapper: {
@@ -7,12 +13,12 @@ module.exports = {
   preset: 'ts-jest/presets/js-with-babel',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   setupFiles: ['<rootDir>/testutils/jest-setup-files.js'],
-  testPathIgnorePatterns: ['/dev_mode/', '/lib/', '/node_modules/'],
-  testRegex: '/tests/test-.*/.*.spec.ts[x]?$',
+  testPathIgnorePatterns: ['/lib/', '/node_modules/'],
+  testRegex: '/tests/.*.spec.ts[x]?$',
   transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*)/)'],
   globals: {
     'ts-jest': {
-      tsConfig: 'tsconfig.json'
+      tsConfig: tsOptions
     }
   }
 };

jupyterlab_git/handlers.py

@@ -142,8 +142,10 @@ def post(self):
         POST request handler,
         fetches Commit SHA, Author Name, Commit Date & Commit Message.
         """
-        current_path = self.get_json_body()["current_path"]
-        result = self.git.log(current_path)
+        body = self.get_json_body()
+        current_path = body["current_path"]
+        history_count = body.get("history_count", 25)
+        result = self.git.log(current_path, history_count)
         self.finish(json.dumps(result))
 
 
@@ -179,9 +181,6 @@ def post(self):
         top_repo_path = self.get_json_body()["top_repo_path"]
         my_output = self.git.diff(top_repo_path)
         self.finish(my_output)
-        print("GIT DIFF")
-        print(my_output)
-
 
 class GitBranchHandler(GitHandler):
     """
@@ -289,12 +288,10 @@ def post(self):
         top_repo_path = data["top_repo_path"]
         if data["checkout_branch"]:
             if data["new_check"]:
-                print("to create a new branch")
                 my_output = self.git.checkout_new_branch(
                     data["branchname"], top_repo_path
                 )
             else:
-                print("switch to an old branch")
                 my_output = self.git.checkout_branch(data["branchname"], top_repo_path)
         elif data["checkout_all"]:
             my_output = self.git.checkout_all(top_repo_path)
@@ -418,7 +415,6 @@ def post(self):
         """
         top_repo_path = self.get_json_body()["top_repo_path"]
         my_output = self.git.add_all_untracked(top_repo_path)
-        print(my_output)
         self.finish(my_output)
 
 class GitChangedFilesHandler(GitHandler):

jupyterlab_git/tests/test_handlers.py

@@ -4,6 +4,7 @@
 from jupyterlab_git.handlers import (
     GitAllHistoryHandler,
     GitBranchHandler,
+    GitLogHandler,
     GitPushHandler,
     GitUpstreamHandler,
     setup_handlers
@@ -120,6 +121,38 @@ def test_branch_handler_localbranch(mock_finish, mock_git):
         'branches': branch['branches']
     }))
 
+@patch('jupyterlab_git.handlers.GitLogHandler.__init__', Mock(return_value=None))
+@patch('jupyterlab_git.handlers.GitLogHandler.get_json_body', Mock(return_value={'current_path': 'test_path', 'history_count': 20}))
+@patch('jupyterlab_git.handlers.GitLogHandler.git')
+@patch('jupyterlab_git.handlers.GitLogHandler.finish')
+def test_log_handler(mock_finish, mock_git):
+    # Given
+    log = {'code': 0, 'commits': []}
+    mock_git.log.return_value = log
+
+    # When
+    GitLogHandler().post()
+
+    # Then
+    mock_git.log.assert_called_with('test_path', 20)
+    mock_finish.assert_called_with(json.dumps(log))
+
+
+@patch('jupyterlab_git.handlers.GitLogHandler.__init__', Mock(return_value=None))
+@patch('jupyterlab_git.handlers.GitLogHandler.get_json_body', Mock(return_value={'current_path': 'test_path'}))
+@patch('jupyterlab_git.handlers.GitLogHandler.git')
+@patch('jupyterlab_git.handlers.GitLogHandler.finish')
+def test_log_handler_no_history_count(mock_finish, mock_git):
+    # Given
+    log = {'code': 0, 'commits': []}
+    mock_git.log.return_value = log
+
+    # When
+    GitLogHandler().post()
+
+    # Then
+    mock_git.log.assert_called_with('test_path', 25)
+    mock_finish.assert_called_with(json.dumps(log))
 
 
 @patch('jupyterlab_git.handlers.GitPushHandler.__init__', Mock(return_value=None))

package.json

@@ -17,7 +17,7 @@
     "build:lib": "tsc",
     "build:all": "jlpm run build:labextension",
     "clean": "jlpm run clean:lib",
-    "clean:lib": "rimraf lib",
+    "clean:lib": "rimraf lib && rimraf tsconfig.tsbuildinfo",
     "clean:labextension": "rimraf jupyterlab_git/labextension",
     "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
     "prepare": "jlpm run clean && jlpm run build",
@@ -68,6 +68,8 @@
   "devDependencies": {
     "@babel/core": "^7.5.0",
     "@babel/preset-env": "^7.5.0",
+    "@jupyterlab/testutils": "^1.1.0",
+    "@types/codemirror": "^0.0.79",
     "@types/enzyme": "3.1.15",
     "@types/jest": "^24",
     "@types/react": "~16.8.13",