Add unit tests

Author: fcollonval

jest.config.js

@@ -14,7 +14,7 @@ module.exports = {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   setupFiles: ['<rootDir>/testutils/jest-setup-files.js'],
   testPathIgnorePatterns: ['/lib/', '/node_modules/'],
-  testRegex: '/tests/test-.*/.*.spec.ts[x]?$',
+  testRegex: '/tests/.*.spec.ts[x]?$',
   transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*)/)'],
   globals: {
     'ts-jest': {

package.json

@@ -68,6 +68,7 @@
   "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",

src/model.ts

@@ -65,37 +65,40 @@ export class GitExtension implements IGitExtension, IDisposable {
       oldValue: this._pathRepository
     };
     if (v === null) {
-      this._pathRepository = null;
-      if (change.newValue !== change.oldValue) {
-        this._refreshStatus();
-        this._repositoryChanged.emit(change);
-      }
+      this._pendingReadyPromise += 1;
+      this._readyPromise.then(() => {
+        this._pathRepository = null;
+        this._pendingReadyPromise -= 1;
+
+        if (change.newValue !== change.oldValue) {
+          this.refreshStatus();
+          this._repositoryChanged.emit(change);
+        }
+      });
     } else {
-      void this.ready.then(() => {
-        this._isReady = false;
-        this._readyPromise = this.showTopLevel(v)
-          .then(results => {
-            if (results.code === 0) {
-              this._pathRepository = results.top_repo_path;
-              change.newValue = results.top_repo_path;
-            } else {
-              this._pathRepository = null;
-            }
-
-            if (change.newValue !== change.oldValue) {
-              this._refreshStatus();
-              this._repositoryChanged.emit(change);
-            }
-          })
-          .catch(reason => {
-            console.error(
-              `Fail to find git top level for path ${v}.\n${reason}`
-            );
-
-            void this._readyPromise.then(() => {
-              this._isReady = true;
-            });
-          });
+      const currentReady = this._readyPromise;
+      this._pendingReadyPromise += 1;
+      this._readyPromise = Promise.all([currentReady, this.showTopLevel(v)])
+        .then(r => {
+          const results = r[1];
+          if (results.code === 0) {
+            this._pathRepository = results.top_repo_path;
+            change.newValue = results.top_repo_path;
+          } else {
+            this._pathRepository = null;
+          }
+
+          if (change.newValue !== change.oldValue) {
+            this.refreshStatus();
+            this._repositoryChanged.emit(change);
+          }
+        })
+        .catch(reason => {
+          console.error(`Fail to find git top level for path ${v}.\n${reason}`);
+        });
+
+      void this._readyPromise.then(() => {
+        this._pendingReadyPromise -= 1;
       });
     }
   }
@@ -162,12 +165,9 @@ export class GitExtension implements IGitExtension, IDisposable {
       return null;
     }
 
-    return (
-      '/' +
-      PathExt.join(
-        PathExt.relative(this._serverRoot, this.pathRepository),
-        path || ''
-      )
+    return PathExt.join(
+      PathExt.relative(this._serverRoot, this.pathRepository),
+      path || ''
     );
   }
 
@@ -760,7 +760,7 @@ export class GitExtension implements IGitExtension, IDisposable {
    * Test whether the model is ready.
    */
   get isReady(): boolean {
-    return this._isReady;
+    return this._pendingReadyPromise === 0;
   }
 
   /**
@@ -787,7 +787,7 @@ export class GitExtension implements IGitExtension, IDisposable {
   private _diffProviders: { [key: string]: Git.IDiffCallback } = {};
   private _isDisposed = false;
   private _readyPromise: Promise<void> = Promise.resolve();
-  private _isReady = true;
+  private _pendingReadyPromise = 0;
   private _poll: Poll;
   private _headChanged = new Signal<IGitExtension, void>(this);
   private _repositoryChanged = new Signal<

src/tokens.ts

@@ -180,6 +180,16 @@ export interface IGitExtension {
    */
   init(path: string): Promise<Response>;
 
+  /**
+   * Gets the path of the file relative to the Jupyter server root.
+   *
+   * If no path is provided, returns the Git repository top folder relative path.
+   * If no Git repository selected, return null
+   *
+   * @param path the file path relative to Git repository top folder
+   */
+  getRelativeFilePath(path?: string): string | null;
+
   /**
    * Register a new diff provider for specified file types
    *