mirror/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-05-19 14:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

inso: use --src for loading a git dir (#4162)

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

* update test snapshots
This commit is contained in:
James Gatz
2021-11-02 09:18:47 +01:00
committed by GitHub
parent 17bb2ce84a
commit 46db5beb97
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/insomnia-inso/src/db/index.test.ts
View File

@@ -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();
});

6
packages/insomnia-inso/src/db/index.ts
View File

@@ -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)}\``);
}