Fix jest tests

Author: fcollonval

src/components/diff/mergeview.ts

@@ -256,7 +256,7 @@ class DiffView implements MergeView.IDiffView {
   private static registerUpdate(dv: DiffView): (mode?: string) => void {
     let edit: MergeView.IState = { from: 0, to: 0, marked: [] };
     let orig: MergeView.IState = { from: 0, to: 0, marked: [] };
-    let debounceChange: number;
+    let debounceChange: ReturnType<typeof setTimeout>;
     let updatingFast: boolean = false;
 
     function update(mode?: string) {

tests/test-components/Diff.spec.tsx

@@ -30,7 +30,7 @@ describe('Diff', () => {
   it('should not render anything when not supported', function() {
     // Given
     const props: IDiffProps = {
-      path: '/path/to/File.py',
+      path: '/path/to/File.unk',
       topRepoPath: 'top/repo/path',
       diffContext: {
         currentRef: { specialRef: 'WORKING' },
@@ -45,7 +45,7 @@ describe('Diff', () => {
     expect(node.html()).toBe(null);
   });
 
-  it('should not support non-ipynb files', function() {
-    expect(isDiffSupported('/path/to/script.py')).toBeFalsy();
+  it('should not support non-ipynb and non text files', function() {
+    expect(isDiffSupported('/path/to/script.unk')).toBeFalsy();
   });
 });

tests/test-components/NBDiff.spec.tsx

@@ -11,7 +11,7 @@ import * as diffResponse from '../test-components/data/diffResponse.json';
 jest.mock('../../src/git');
 
 describe('NBDiff', () => {
-  it('should render error in if API response is failed', async function() {
+  it('should render error in if API response is failed', async () => {
     // Given
     const props: IDiffProps = {
       path: '/path/to/File.ipynb',
@@ -34,22 +34,22 @@ describe('NBDiff', () => {
     const node = shallow(<NBDiff {...props} />);
 
     // Then
-    jsonResult.then(() => {
-      node.update();
+    await jsonResult;
 
-      expect(httpGitRequest).toHaveBeenCalled();
-      expect(httpGitRequest).toBeCalledWith('/nbdime/api/gitdiff', 'POST', {
-        file_path: '/path/to/File.ipynb',
-        ref_curr: { special: 'WORKING' },
-        ref_prev: { git: '83baee' }
-      });
-      expect(node.find('.jp-git-diff-error').text()).toContain(
-        'TEST_ERROR_MESSAGE'
-      );
+    node.update();
+
+    expect(httpGitRequest).toHaveBeenCalled();
+    expect(httpGitRequest).toBeCalledWith('/nbdime/api/gitdiff', 'POST', {
+      file_path: 'top/repo/path/path/to/File.ipynb',
+      ref_remote: { special: 'WORKING' },
+      ref_local: { git: '83baee' }
     });
+    expect(node.find('.jp-git-diff-error').text()).toContain(
+      'TEST_ERROR_MESSAGE'
+    );
   });
 
-  it('should render header and cell diff components in success case', async function() {
+  it('should render header and cell diff components in success case', async () => {
     // Given
     const props: IDiffProps = {
       path: '/path/to/File.ipynb',
@@ -61,7 +61,7 @@ describe('NBDiff', () => {
     };
 
     const jsonResult: Promise<any> = Promise.resolve({
-      diffResponse
+      ...diffResponse
     });
 
     (httpGitRequest as jest.Mock).mockReturnValue(
@@ -72,18 +72,17 @@ describe('NBDiff', () => {
     const node = shallow(<NBDiff {...props} />);
 
     // Then
-    jsonResult.then(() => {
-      node.update();
+    await jsonResult;
+    node.update();
 
-      expect(httpGitRequest).toHaveBeenCalled();
-      expect(httpGitRequest).toBeCalledWith('/nbdime/api/gitdiff', 'POST', {
-        file_path: '/path/to/File.ipynb',
-        ref_curr: { special: 'WORKING' },
-        ref_prev: { git: '83baee' }
-      });
-      expect(node.find('.jp-git-diff-error').html()).toBeNull();
-      expect(node.find(NBDiffHeader)).toHaveLength(1);
-      expect(node.find(CellDiff)).toHaveLength(2);
+    expect(httpGitRequest).toHaveBeenCalled();
+    expect(httpGitRequest).toBeCalledWith('/nbdime/api/gitdiff', 'POST', {
+      file_path: 'top/repo/path/path/to/File.ipynb',
+      ref_remote: { special: 'WORKING' },
+      ref_local: { git: '83baee' }
     });
+    expect(node.find('.jp-git-diff-error')).toHaveLength(0);
+    expect(node.find(NBDiffHeader)).toHaveLength(1);
+    expect(node.find(CellDiff)).toHaveLength(3);
   });
 });