From 46db5beb9727335e890d5dd38ee356031f579661 Mon Sep 17 00:00:00 2001
From: James Gatz <jamesgatzos@gmail.com>
Date: Tue, 2 Nov 2021 09:18:47 +0100
Subject: [PATCH] inso: use --src for loading a git dir (#4162)

* Use --src as an override to workingDir for loading a git dir

* update test snapshots
---
 packages/insomnia-inso/src/db/index.test.ts | 6 +++---
 packages/insomnia-inso/src/db/index.ts      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/insomnia-inso/src/db/index.test.ts b/packages/insomnia-inso/src/db/index.test.ts
index 4f9023cc20..b60f249a5f 100644
--- a/packages/insomnia-inso/src/db/index.test.ts
+++ b/packages/insomnia-inso/src/db/index.test.ts
@@ -59,7 +59,7 @@ describe('loadDb()', () => {
   });
 
   it('should load nedb from src', async () => {
-    gitAdapter.mockResolvedValue(emptyDb());
+    gitAdapter.mockResolvedValue(null);
     neDbAdapter.mockResolvedValue(emptyDb());
     await loadDb({
       src: 'dir',
@@ -68,7 +68,7 @@ describe('loadDb()', () => {
     expect(logger.__getLogs().debug).toEqual([
       `Data store configured from app data directory at \`${path.resolve('dir')}\``,
     ]);
-    expect(gitAdapter).not.toHaveBeenCalled();
+    expect(gitAdapter).toHaveBeenCalledWith('dir', ['Environment']);
     expect(neDbAdapter).toHaveBeenCalledWith('dir', ['Environment']);
   });
 
@@ -94,7 +94,7 @@ describe('loadDb()', () => {
     expect(logger.__getLogs().debug).toEqual([
       `Data store configured from app data directory at \`${path.resolve('dir')}\``,
     ]);
-    expect(gitAdapter).not.toHaveBeenCalled();
+    expect(gitAdapter).toHaveBeenCalled();
     expect(neDbAdapter).toHaveBeenCalled();
   });
 
diff --git a/packages/insomnia-inso/src/db/index.ts b/packages/insomnia-inso/src/db/index.ts
index 887b93467f..b4620c03b6 100644
--- a/packages/insomnia-inso/src/db/index.ts
+++ b/packages/insomnia-inso/src/db/index.ts
@@ -56,14 +56,14 @@ export const loadDb = async ({
   let db: Database | null = null;
 
   // try load from git
-  if (!appDataDir && !src) {
-    const dir = workingDir || '.';
+  if (!appDataDir) {
+    const dir = src || workingDir || '.';
     db = await gitAdapter(dir, filterTypes);
     db && logger.debug(`Data store configured from git repository at \`${path.resolve(dir)}\``);
   }
 
   // try load from file (higher priority)
-  if (src) {
+  if (!db && src) {
     db = await insomniaAdapter(src, filterTypes);
     db && logger.debug(`Data store configured from file at \`${path.resolve(src)}\``);
   }