Fix jest tests

Author: fcollonval

src/gitMenuCommands.ts

@@ -177,6 +177,41 @@ export function addCommands(
     }
   });
 
+  /** Add git push command */
+  commands.addCommand(CommandIDs.gitPush, {
+    label: 'Push to Remote',
+    caption: 'Push code to remote repository',
+    isEnabled: () => model.pathRepository !== null,
+    execute: async () => {
+      await Private.showGitOperationDialog(model, Operation.Push).catch(
+        reason => {
+          console.error(
+            `Encountered an error when pushing changes. Error: ${reason}`
+          );
+        }
+      );
+    }
+  });
+
+  /** Add git pull command */
+  commands.addCommand(CommandIDs.gitPull, {
+    label: 'Pull from Remote',
+    caption: 'Pull latest code from remote repository',
+    isEnabled: () => model.pathRepository !== null,
+    execute: async () => {
+      await Private.showGitOperationDialog(model, Operation.Pull).catch(
+        reason => {
+          console.error(
+            `Encountered an error when pulling changes. Error: ${reason}`
+          );
+        }
+      );
+    }
+  });
+}
+
+/* eslint-disable no-inner-declarations */
+namespace Private {
   /**
    * Displays an error dialog when a Git operation fails.
    *
@@ -185,7 +220,7 @@ export function addCommands(
    * @param operation - Git operation name
    * @returns Promise for displaying a dialog
    */
-  async function showGitOperationDialog(
+  export async function showGitOperationDialog(
     model: IGitExtension,
     operation: Operation
   ): Promise<void> {
@@ -218,32 +253,5 @@ export function addCommands(
       retry = true;
     }
   }
-
-  /** Add git push command */
-  commands.addCommand(CommandIDs.gitPush, {
-    label: 'Push to Remote',
-    caption: 'Push code to remote repository',
-    isEnabled: () => model.pathRepository !== null,
-    execute: async () => {
-      await showGitOperationDialog(model, Operation.Push).catch(reason => {
-        console.error(
-          `Encountered an error when pushing changes. Error: ${reason}`
-        );
-      });
-    }
-  });
-
-  /** Add git pull command */
-  commands.addCommand(CommandIDs.gitPull, {
-    label: 'Pull from Remote',
-    caption: 'Pull latest code from remote repository',
-    isEnabled: () => model.pathRepository !== null,
-    execute: async () => {
-      await showGitOperationDialog(model, Operation.Pull).catch(reason => {
-        console.error(
-          `Encountered an error when pulling changes. Error: ${reason}`
-        );
-      });
-    }
-  });
 }
+/* eslint-enable no-inner-declarations */

tests/test-components/Toolbar.spec.tsx

@@ -1,21 +1,28 @@
 import { refreshIcon } from '@jupyterlab/ui-components';
+import * as commands from '@lumino/commands';
 import { shallow } from 'enzyme';
 import 'jest';
 import * as React from 'react';
 import { ActionButton } from '../../src/components/ActionButton';
 import { Toolbar } from '../../src/components/Toolbar';
 import * as git from '../../src/git';
+import { CommandIDs } from '../../src/gitMenuCommands';
 import { GitExtension } from '../../src/model';
 import { pullIcon, pushIcon } from '../../src/style/icons';
 import {
   toolbarButtonClass,
   toolbarMenuButtonClass
 } from '../../src/style/Toolbar';
 
+jest.mock('@lumino/commands');
 jest.mock('../../src/git');
 
-async function createModel() {
-  const model = new GitExtension();
+async function createModel(commands?: commands.CommandRegistry) {
+  const app = {
+    commands,
+    shell: null as any
+  };
+  const model = new GitExtension(app as any);
 
   jest.spyOn(model, 'currentBranch', 'get').mockReturnValue({
     is_current_branch: true,
@@ -303,17 +310,25 @@ describe('Toolbar', () => {
 
   describe('pull changes', () => {
     let model: GitExtension;
+    let mockedExecute: any;
 
     beforeEach(async () => {
+      const mockedCommands = commands as jest.Mocked<typeof commands>;
+      mockedExecute = jest.fn();
+      mockedCommands.CommandRegistry.mockImplementation(() => {
+        return {
+          execute: mockedExecute
+        } as any;
+      });
+      const registry = new commands.CommandRegistry();
+
       const mock = git as jest.Mocked<typeof git>;
       mock.httpGitRequest.mockImplementation(request);
 
-      model = await createModel();
+      model = await createModel(registry);
     });
 
     it('should pull changes when the button to pull the latest changes is clicked', () => {
-      const spy = jest.spyOn(GitExtension.prototype, 'pull');
-
       const props = {
         model: model,
         branching: false,
@@ -323,26 +338,32 @@ describe('Toolbar', () => {
       const button = node.find(`.${toolbarButtonClass}`).first();
 
       button.simulate('click');
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(undefined);
-
-      spy.mockRestore();
+      expect(mockedExecute).toHaveBeenCalledTimes(1);
+      expect(mockedExecute).toHaveBeenCalledWith(CommandIDs.gitPull);
     });
   });
 
   describe('push changes', () => {
     let model: GitExtension;
+    let mockedExecute: any;
 
     beforeEach(async () => {
+      const mockedCommands = commands as jest.Mocked<typeof commands>;
+      mockedExecute = jest.fn();
+      mockedCommands.CommandRegistry.mockImplementation(() => {
+        return {
+          execute: mockedExecute
+        } as any;
+      });
+      const registry = new commands.CommandRegistry();
+
       const mock = git as jest.Mocked<typeof git>;
       mock.httpGitRequest.mockImplementation(request);
 
-      model = await createModel();
+      model = await createModel(registry);
     });
 
     it('should push changes when the button to push the latest changes is clicked', () => {
-      const spy = jest.spyOn(GitExtension.prototype, 'push');
-
       const props = {
         model: model,
         branching: false,
@@ -352,10 +373,8 @@ describe('Toolbar', () => {
       const button = node.find(`.${toolbarButtonClass}`).at(1);
 
       button.simulate('click');
-      expect(spy).toHaveBeenCalledTimes(1);
-      expect(spy).toHaveBeenCalledWith(undefined);
-
-      spy.mockRestore();
+      expect(mockedExecute).toHaveBeenCalledTimes(1);
+      expect(mockedExecute).toHaveBeenCalledWith(CommandIDs.gitPush);
     });
   });