Refactored so reload on save handles the save event as well

Since this has a one time setup this works better to include the vscode onDidSaveTextDocument with the reload callback.
rkotze · Jan 14, 2019 · c005d37 · c005d37
1 parent d0796a8
commit c005d37
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/__mocks__/vscode.js b/__mocks__/vscode.js
@@ -15,7 +15,8 @@ const window = {
 
 const workspace = {
   getConfiguration: jest.fn(),
-  workspaceFolders: []
+  workspaceFolders: [],
+  onDidSaveTextDocument: jest.fn()
 };
 
 const OverviewRulerLane = {
@@ -53,4 +54,4 @@ const vscode = {
   commands
 };
 
-exports = vscode;
+module.exports = vscode;
diff --git a/src/git-mob-list.js b/src/git-mob-list.js
@@ -15,8 +15,7 @@ function setupGitMob(context) {
 
   reloadCommand({ coAuthorProvider });
   openGitCoAuthor({ coAuthorProvider });
-  const { onDidSaveTextDocument } = vscode.workspace;
-  onDidSaveTextDocument(reloadOnSave(coAuthorProvider));
+  reloadOnSave(coAuthorProvider);
 
   coAuthorProvider.loaded = function() {
     mobList.onDidChangeVisibility(function({ visible }) {

diff --git a/src/reload-on-save.js b/src/reload-on-save.js
@@ -1,12 +1,15 @@
+const vscode = require("vscode");
 const { CONSTANTS } = require("./constants");
 
 function reloadOnSave(coAuthorProvider) {
-  return function(textDocument) {
+  const { onDidSaveTextDocument } = vscode.workspace;
+
+  onDidSaveTextDocument(function(textDocument) {
     if (textDocument.fileName.includes(CONSTANTS.GIT_COAUTHORS_FILE)) {
       coAuthorProvider.mobAuthors.reset();
       coAuthorProvider.reloadData();
     }
-  };
+  });
 }
 
 exports.reloadOnSave = reloadOnSave;
diff --git a/src/reload-on-save.spec.js b/src/reload-on-save.spec.js
@@ -1,5 +1,6 @@
 const { reloadOnSave } = require("./reload-on-save");
 const { CONSTANTS } = require("./constants");
+let vscode = require("../__mocks__/vscode");
 
 const coAuthorProviderStub = {
   reloadData: jest.fn(),
@@ -14,23 +15,31 @@ const otherTextDocStub = {
   fileName: `file/Path/to/other.js`
 };
 
+let saveTrigger = null;
+beforeEach(() => {
+  vscode.workspace.onDidSaveTextDocument = jest.fn(cb => {
+    saveTrigger = cb;
+  });
+});
+
 afterEach(() => {
   coAuthorProviderStub.reloadData.mockReset();
   coAuthorProviderStub.mobAuthors.reset.mockReset();
+  saveTrigger = null;
 });
 
 test("Reload co-author list when git-coauthors file saved", () => {
-  const saveAction = reloadOnSave(coAuthorProviderStub);
-  expect(saveAction).toEqual(expect.any(Function));
-  saveAction(coAuthorTextDocStub);
+  reloadOnSave(coAuthorProviderStub);
+  expect(saveTrigger).toEqual(expect.any(Function));
+  saveTrigger(coAuthorTextDocStub);
   expect(coAuthorProviderStub.reloadData).toHaveBeenCalledTimes(1);
   expect(coAuthorProviderStub.mobAuthors.reset).toHaveBeenCalledTimes(1);
 });
 
 test("Do NOT reload co-author list when other files are saved", () => {
-  const saveAction = reloadOnSave(coAuthorProviderStub);
-  expect(saveAction).toEqual(expect.any(Function));
-  saveAction(otherTextDocStub);
+  reloadOnSave(coAuthorProviderStub);
+  expect(saveTrigger).toEqual(expect.any(Function));
+  saveTrigger(otherTextDocStub);
   expect(coAuthorProviderStub.reloadData).not.toHaveBeenCalled();
   expect(coAuthorProviderStub.mobAuthors.reset).not.toHaveBeenCalled();
 });