@meza/adr-tools 1.0.8 → 1.0.11

package/src/lib/manipulator.test.ts

@@ -1,49 +1,50 @@
 import { describe, expect, it } from 'vitest';
-import { injectLink, getTitleFrom, getLinksFrom } from './manipulator';
+import { getLinksFrom, getTitleFrom, injectLink } from './manipulator.js';
 
 describe('The ADR manipulator', () => {
+  const original =
+    '# NUMBER. TITLE\n' +
+    '\n' +
+    'Date: DATE\n' +
+    '\n' +
+    '## Status\n' +
+    '\n' +
+    'STATUS\n' +
+    '\n' +
+    '## Context\n' +
+    '\n' +
+    'The issue motivating this decision, and any context that influences or constrains the decision.\n' +
+    '\n' +
+    '## Decision\n' +
+    '\n' +
+    "The change that we're proposing or have agreed to implement.\n" +
+    '\n' +
+    '## Consequences\n' +
+    '\n' +
+    'What becomes easier or more difficult to do and any risks introduced by the change that will need to be mitigated.\n';
 
-  const original = '# NUMBER. TITLE\n'
-    + '\n'
-    + 'Date: DATE\n'
-    + '\n'
-    + '## Status\n'
-    + '\n'
-    + 'STATUS\n'
-    + '\n'
-    + '## Context\n'
-    + '\n'
-    + 'The issue motivating this decision, and any context that influences or constrains the decision.\n'
-    + '\n'
-    + '## Decision\n'
-    + '\n'
-    + 'The change that we\'re proposing or have agreed to implement.\n'
-    + '\n'
-    + '## Consequences\n'
-    + '\n'
-    + 'What becomes easier or more difficult to do and any risks introduced by the change that will need to be mitigated.\n';
-
-  const modified = '# NUMBER. TITLE\n'
-    + '\n'
-    + 'Date: DATE\n'
-    + '\n'
-    + '## Status\n'
-    + '\n'
-    + 'STATUS\n'
-    + '\n'
-    + 'INJECTED STUFF\n'
-    + '\n'
-    + '## Context\n'
-    + '\n'
-    + 'The issue motivating this decision, and any context that influences or constrains the decision.\n'
-    + '\n'
-    + '## Decision\n'
-    + '\n'
-    + 'The change that we\'re proposing or have agreed to implement.\n'
-    + '\n'
-    + '## Consequences\n'
-    + '\n'
-    + 'What becomes easier or more difficult to do and any risks introduced by the change that will need to be mitigated.\n';
+  const modified =
+    '# NUMBER. TITLE\n' +
+    '\n' +
+    'Date: DATE\n' +
+    '\n' +
+    '## Status\n' +
+    '\n' +
+    'STATUS\n' +
+    '\n' +
+    'INJECTED STUFF\n' +
+    '\n' +
+    '## Context\n' +
+    '\n' +
+    'The issue motivating this decision, and any context that influences or constrains the decision.\n' +
+    '\n' +
+    '## Decision\n' +
+    '\n' +
+    "The change that we're proposing or have agreed to implement.\n" +
+    '\n' +
+    '## Consequences\n' +
+    '\n' +
+    'What becomes easier or more difficult to do and any risks introduced by the change that will need to be mitigated.\n';
 
   it('can inject links to the status section', () => {
     const test = injectLink(original, 'INJECTED STUFF');
@@ -70,9 +71,7 @@ describe('The ADR manipulator', () => {
   });
 
   it('can extract links from the status section', () => {
-    const original = '## Status\n'
-      + '\n'
-      + 'Superseded by [3. title here](and-a-link-here.md)\n';
+    const original = '## Status\n' + '\n' + 'Superseded by [3. title here](and-a-link-here.md)\n';
     const extractedLink = getLinksFrom(original);
 
     expect(extractedLink[0]).toEqual({
@@ -82,7 +81,5 @@ describe('The ADR manipulator', () => {
       href: 'and-a-link-here.md',
       raw: 'Superseded by [3. title here](and-a-link-here.md)'
     });
-
   });
-
 });

package/src/lib/manipulator.ts

@@ -1,13 +1,13 @@
 import { marked } from 'marked';
 
 const convertToMd = (tokens: marked.Token[]) => {
-  return tokens.map(token => token.raw).join('');
+  return tokens.map((token) => token.raw).join('');
 };
 
 export const getLinksFrom = (markdown: string) => {
   const tokens = marked.lexer(markdown);
   const linkRegex = new RegExp(/^(.*)\s\[(.*)\]\((.*)\)$/);
-  const links = tokens.filter(token => token.type === 'paragraph' && linkRegex.test(token.text));
+  const links = tokens.filter((token) => token.type === 'paragraph' && linkRegex.test(token.text));
 
   return links.map((link) => {
     const linkToken = link as marked.Tokens.Paragraph;
@@ -27,7 +27,7 @@ export const getLinksFrom = (markdown: string) => {
 
 export const getTitleFrom = (adr: string) => {
   const tokens = marked.lexer(adr);
-  const mainHead = tokens.find(token => token.type === 'heading' && token.depth === 1);
+  const mainHead = tokens.find((token) => token.type === 'heading' && token.depth === 1);
   if (!mainHead) {
     throw new Error('No main heading found');
   }
@@ -36,20 +36,27 @@ export const getTitleFrom = (adr: string) => {
 
 export const supersede = (markdown: string, link: string) => {
   const tokens = marked.lexer(markdown);
-  const statusIndex = tokens.findIndex(token => token.type === 'heading' && token.text.toLowerCase() === 'status');
+  const statusIndex = tokens.findIndex((token) => token.type === 'heading' && token.text.toLowerCase() === 'status');
   if (statusIndex < 0) {
     throw new Error('Could not find status section');
   }
   const statusDepth = (tokens[statusIndex] as marked.Tokens.Heading).depth;
-  const followingHeadingIndex = tokens.findIndex((token, index) => token.type === 'heading' && token.depth === statusDepth && index > statusIndex);
-  const followingParagraphIndex = tokens.findIndex((token, index) => token.type === 'paragraph' && index > statusIndex && index < followingHeadingIndex);
+  const followingHeadingIndex = tokens.findIndex(
+    (token, index) => token.type === 'heading' && token.depth === statusDepth && index > statusIndex
+  );
+  const followingParagraphIndex = tokens.findIndex(
+    (token, index) => token.type === 'paragraph' && index > statusIndex && index < followingHeadingIndex
+  );
 
   if (followingParagraphIndex > followingHeadingIndex || followingParagraphIndex === -1) {
     throw new Error('There is no status paragraph. Please format your adr properly');
   }
 
   tokens[followingParagraphIndex] = {
-    type: 'paragraph', text: link, raw: link, tokens: [
+    type: 'paragraph',
+    text: link,
+    raw: link,
+    tokens: [
       {
         type: 'text',
         raw: link,
@@ -62,18 +69,23 @@ export const supersede = (markdown: string, link: string) => {
 
 export const injectLink = (markdown: string, link: string) => {
   const tokens = marked.lexer(markdown);
-  const statusIndex = tokens.findIndex(token => token.type === 'heading' && token.text.toLowerCase() === 'status');
+  const statusIndex = tokens.findIndex((token) => token.type === 'heading' && token.text.toLowerCase() === 'status');
   if (statusIndex < 0) {
     throw new Error('Could not find status section');
   }
 
   const statusDepth = (tokens[statusIndex] as marked.Tokens.Heading).depth;
-  let followingHeadingIndex = tokens.findIndex((token, index) => token.type === 'heading' && token.depth === statusDepth && index > statusIndex);
+  let followingHeadingIndex = tokens.findIndex(
+    (token, index) => token.type === 'heading' && token.depth === statusDepth && index > statusIndex
+  );
   if (followingHeadingIndex < 0) {
     followingHeadingIndex = tokens.length;
   }
   tokens.splice(followingHeadingIndex, 0, {
-    type: 'paragraph', text: link, raw: link, tokens: [
+    type: 'paragraph',
+    text: link,
+    raw: link,
+    tokens: [
       {
         type: 'text',
         raw: link,

package/src/lib/numbering.test.ts

@@ -1,16 +1,15 @@
-import { afterAll, describe, it, vi, expect } from 'vitest';
 import fs from 'fs/promises';
-import { newNumber } from './numbering';
+import { afterAll, describe, expect, it, vi } from 'vitest';
+import { newNumber } from './numbering.js';
 
-type ReaddirMock = () => Promise<String[]>
+type ReaddirMock = () => Promise<string[]>;
 
 vi.mock('fs/promises');
-vi.mock('./config', () => ({
+vi.mock('./config.js', () => ({
   getDir: vi.fn().mockResolvedValue('/')
 }));
 
 describe('The numbering logic', () => {
-
   afterAll(() => {
     vi.resetAllMocks();
   });
@@ -29,10 +28,7 @@ describe('The numbering logic', () => {
   });
 
   it('processes existing files if there is no lockfile', async () => {
-    const fakeFiles: string[] = [
-      '0001-first-file.md',
-      '0002-first-file.md'
-    ];
+    const fakeFiles: string[] = ['0001-first-file.md', '0002-first-file.md'];
     vi.mocked(fs.readFile).mockRejectedValueOnce('no sequence file');
     vi.mocked(fs.readdir as unknown as ReaddirMock).mockResolvedValueOnce(fakeFiles);
     const num = await newNumber();

package/src/lib/numbering.ts

@@ -1,17 +1,17 @@
-import fs from 'fs/promises';
-import { getDir } from './config';
 import * as path from 'path';
+import fs from 'fs/promises';
+import { getDir } from './config.js';
 
 export const newNumber = async () => {
   try {
     const lockfile = await fs.readFile(path.resolve(await getDir(), '.adr-sequence.lock'));
     return parseInt(lockfile.toString().trim(), 10) + 1;
-  } catch (e) {
+  } catch (_e) {
     // This is for backward compatibility. If someone upgrades from an older tool without a lockfile,
     // we create one.
     const filePattern = /^0*(\d+)-.*$/;
     const files = await fs.readdir(await getDir());
-    const numbers = files.map(f => {
+    const numbers = files.map((f) => {
       const adrFile = f.match(filePattern);
       if (adrFile) {
         return parseInt(adrFile[1], 10);
@@ -22,5 +22,4 @@ export const newNumber = async () => {
     const largestNumber = numbers.reduce((a, b) => Math.max(a, b), 0);
     return largestNumber + 1;
   }
-
 };

package/src/lib/prompt.test.ts

@@ -0,0 +1,42 @@
+import { faker } from '@faker-js/faker';
+import inquirer, { ListQuestion, Question } from 'inquirer';
+import { describe, expect, it, vi } from 'vitest';
+import { askForClarification } from './prompt.js';
+
+vi.mock('inquirer');
+vi.mock('chalk', () => ({
+  default: {
+    blue: (str: string) => {
+      return `BLUE[${str}]`;
+    }
+  }
+}));
+describe('The prompt helper', () => {
+  it('calls inquirer correctly', async () => {
+    const prompt = vi.mocked(inquirer.prompt);
+    prompt.mockResolvedValueOnce({ target: 'does not matter' });
+
+    const randomChoices = [faker.system.filePath(), faker.system.filePath(), faker.system.filePath()];
+    await askForClarification('this is the search string', randomChoices);
+
+    expect(prompt).toHaveBeenCalledOnce();
+    const calledWith = prompt.mock.calls[0][0] as Question[];
+    expect(calledWith[0].type).toEqual('list');
+    expect((calledWith[0] as ListQuestion).choices).toEqual(randomChoices);
+    expect(calledWith[0].message).toMatchInlineSnapshot(
+      '"Which file do you want to link to for BLUE[this is the search string]?"'
+    );
+  });
+
+  it('returns the selected choice', async () => {
+    const prompt = vi.mocked(inquirer.prompt);
+
+    const randomResult = faker.system.filePath();
+
+    prompt.mockResolvedValueOnce({ target: randomResult });
+
+    const result = await askForClarification('this is the search string', ['does not matter']);
+
+    expect(result).toEqual(randomResult);
+  });
+});

package/src/lib/prompt.ts

@@ -0,0 +1,14 @@
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+
+export const askForClarification = async (searchString: string, matches: string[]) => {
+  const selection = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'target',
+      message: `Which file do you want to link to for ${chalk.blue(searchString)}?`,
+      choices: matches
+    }
+  ]);
+  return selection.target;
+};

package/src/lib/template.ts

@@ -1,6 +1,10 @@
+import * as path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import fs from 'fs/promises';
-import path from 'path';
-import { getDir } from './config';
+import { getDir } from './config.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 export const template = async (templateFile?: string): Promise<string> => {
   if (templateFile) {
@@ -12,7 +16,7 @@ export const template = async (templateFile?: string): Promise<string> => {
 
   try {
     return await fs.readFile(path.join(await getDir(), 'templates/template.md'), 'utf8');
-  } catch (e) {
+  } catch (_e) {
     return await fs.readFile(path.resolve(path.join(__dirname, '../templates/template.md')), 'utf8');
   }
 };

package/src/version.ts

@@ -1,2 +1,2 @@
-export const LIB_VERSION = '0.0.0-development';
+export const LIB_VERSION = '1.0.11';
 

package/tests/.adr-dir

@@ -0,0 +1 @@
+f8877fa6-908f-4cf5-91cb-9a910b9376f7

package/tests/__snapshots__/generate-graph.e2e.test.ts.snap

@@ -1,21 +1,21 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Generating Graphs > should generate a graph 1`] = `
 "digraph {
   node [shape=plaintext];
   subgraph {
-    _1 [label=\\"1. Record architecture decisions\\"; URL=\\"0001-record-architecture-decisions.html\\"];
-    _2 [label=\\"2. An idea that seems good at the time\\"; URL=\\"0002-an-idea-that-seems-good-at-the-time.html\\"];
-    _1 -> _2 [style=\\"dotted\\", weight=1];
-    _3 [label=\\"3. A better idea\\"; URL=\\"0003-a-better-idea.html\\"];
-    _2 -> _3 [style=\\"dotted\\", weight=1];
-    _4 [label=\\"4. This will work\\"; URL=\\"0004-this-will-work.html\\"];
-    _3 -> _4 [style=\\"dotted\\", weight=1];
-    _5 [label=\\"5. The end\\"; URL=\\"0005-the-end.html\\"];
-    _4 -> _5 [style=\\"dotted\\", weight=1];
+    _1 [label="1. Record architecture decisions"; URL="0001-record-architecture-decisions.html"];
+    _2 [label="2. An idea that seems good at the time"; URL="0002-an-idea-that-seems-good-at-the-time.html"];
+    _1 -> _2 [style="dotted", weight=1];
+    _3 [label="3. A better idea"; URL="0003-a-better-idea.html"];
+    _2 -> _3 [style="dotted", weight=1];
+    _4 [label="4. This will work"; URL="0004-this-will-work.html"];
+    _3 -> _4 [style="dotted", weight=1];
+    _5 [label="5. The end"; URL="0005-the-end.html"];
+    _4 -> _5 [style="dotted", weight=1];
   }
-  _3 -> _2 [label=\\"Supersedes\\", weight=0]
-  _5 -> _3 [label=\\"Supersedes\\", weight=0]
+  _3 -> _2 [label="Supersedes", weight=0]
+  _5 -> _3 [label="Supersedes", weight=0]
 }"
 `;
 
@@ -23,17 +23,17 @@ exports[`Generating Graphs > should generate a graph with specified route and ex
 "digraph {
   node [shape=plaintext];
   subgraph {
-    _1 [label=\\"1. Record architecture decisions\\"; URL=\\"http://example.com/0001-record-architecture-decisions.xxx\\"];
-    _2 [label=\\"2. An idea that seems good at the time\\"; URL=\\"http://example.com/0002-an-idea-that-seems-good-at-the-time.xxx\\"];
-    _1 -> _2 [style=\\"dotted\\", weight=1];
-    _3 [label=\\"3. A better idea\\"; URL=\\"http://example.com/0003-a-better-idea.xxx\\"];
-    _2 -> _3 [style=\\"dotted\\", weight=1];
-    _4 [label=\\"4. This will work\\"; URL=\\"http://example.com/0004-this-will-work.xxx\\"];
-    _3 -> _4 [style=\\"dotted\\", weight=1];
-    _5 [label=\\"5. The end\\"; URL=\\"http://example.com/0005-the-end.xxx\\"];
-    _4 -> _5 [style=\\"dotted\\", weight=1];
+    _1 [label="1. Record architecture decisions"; URL="http://example.com/0001-record-architecture-decisions.xxx"];
+    _2 [label="2. An idea that seems good at the time"; URL="http://example.com/0002-an-idea-that-seems-good-at-the-time.xxx"];
+    _1 -> _2 [style="dotted", weight=1];
+    _3 [label="3. A better idea"; URL="http://example.com/0003-a-better-idea.xxx"];
+    _2 -> _3 [style="dotted", weight=1];
+    _4 [label="4. This will work"; URL="http://example.com/0004-this-will-work.xxx"];
+    _3 -> _4 [style="dotted", weight=1];
+    _5 [label="5. The end"; URL="http://example.com/0005-the-end.xxx"];
+    _4 -> _5 [style="dotted", weight=1];
   }
-  _3 -> _2 [label=\\"Supersedes\\", weight=0]
-  _5 -> _3 [label=\\"Supersedes\\", weight=0]
+  _3 -> _2 [label="Supersedes", weight=0]
+  _5 -> _3 [label="Supersedes", weight=0]
 }"
 `;

package/tests/__snapshots__/init-adr-repository.e2e.test.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Init an ADR Repository > should use an alternate directory 1`] = `
 "# 1. Record architecture decisions

package/tests/__snapshots__/linking-records.e2e.test.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Linking Adrs > should link adrs as expected with adr link 1`] = `
 "# 1. First Record

package/tests/__snapshots__/new-adr.e2e.test.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`New Adrs > should create a new one even if no config exists 1`] = `
 "# 1. Example ADR

package/tests/__snapshots__/superseding-records.e2e.test.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Superseding Adrs > should be able to supersede multiple records 1`] = `
 "# 1. First Record

package/tests/__snapshots__/toc-prefixing.e2e.test.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Generating TOC > should add a path prefix to the toc when there is one supplied 1`] = `
 "# Table of Contents

package/tests/__snapshots__/use-template-override.e2e.test.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`Overriding templates > should use an override template if one exists 1`] = `
 "# This is an override template

package/tests/edit-on-create.e2e.test.ts

@@ -1,13 +1,13 @@
-/* eslint-disable no-sync */
-import { describe, it, expect, afterEach, beforeEach } from 'vitest';
 import * as childProcess from 'child_process';
-import * as path from 'path';
 import * as fs from 'fs';
 import * as os from 'os';
+import * as path from 'path';
+/* eslint-disable no-sync */
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 describe('Edit new Adrs on creation', () => {
   const adr = path.resolve(path.dirname(__filename), '../src/index.ts');
-  const command = `npx ts-node ${adr}`;
+  const command = `npx tsx ${adr}`;
   const visualHelper = path.resolve(path.dirname(__filename), './fake-visual');
   const editorHelper = path.resolve(path.dirname(__filename), './fake-editor');
 
@@ -17,24 +17,28 @@ describe('Edit new Adrs on creation', () => {
   beforeEach(() => {
     // @ts-ignore
     process.env.ADR_DATE = '1992-01-12';
-    workDir = fs.mkdtempSync(path.join(os.tmpdir(), 'adr-'));
-    adrDirectory = path.join(workDir, 'doc/adr');
+    workDir = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'adr-')));
+    adrDirectory = path.resolve(path.join(workDir, 'doc/adr'));
   });
 
   afterEach(() => {
-    childProcess.execSync(`rm -rf ${workDir}`);
+    fs.rmdirSync(workDir, {
+      recursive: true,
+      maxRetries: 3,
+      retryDelay: 500
+    });
   });
 
   it('should open a new ADR in the VISUAL', () => {
-    childProcess.execSync(`VISUAL="${visualHelper}" ${command} new Example ADR`, { cwd: workDir });
+    childProcess.execSync(`VISUAL="${visualHelper}" ${command} new Example ADR`, { timeout: 10000, cwd: workDir });
 
     const expectedNewFile: string = path.join(workDir, 'visual.out');
     const fileContents = fs.readFileSync(expectedNewFile, 'utf8');
     expect(fileContents.trim()).toEqual(`VISUAL ${adrDirectory}/0001-example-adr.md`);
   });
 
-  it('should open a new ADR in the EDITOR', () => {
-    childProcess.execSync(`EDITOR="${editorHelper}" ${command} new Example ADR`, { cwd: workDir });
+  it.skip('should open a new ADR in the EDITOR', () => {
+    childProcess.execSync(`EDITOR="${editorHelper}" ${command} new Example ADR`, { timeout: 10000, cwd: workDir });
 
     const expectedNewFile: string = path.join(workDir, 'editor.out');
     const fileContents = fs.readFileSync(expectedNewFile, 'utf8');
@@ -42,7 +46,9 @@ describe('Edit new Adrs on creation', () => {
   });
 
   it('should open a new ADR in the VISUAL if both VISUAL and EDITOR is supplied', () => {
-    childProcess.execSync(`EDITOR="${editorHelper}" VISUAL="${visualHelper}" ${command} new Example ADR`, { cwd: workDir });
+    childProcess.execSync(`EDITOR="${editorHelper}" VISUAL="${visualHelper}" ${command} new Example ADR`, {
+      cwd: workDir
+    });
 
     expect(fs.existsSync(path.join(workDir, 'editor.out'))).toBeFalsy();
 
@@ -50,5 +56,4 @@ describe('Edit new Adrs on creation', () => {
     const fileContents = fs.readFileSync(expectedNewFile, 'utf8');
     expect(fileContents.trim()).toEqual(`VISUAL ${adrDirectory}/0001-example-adr.md`);
   });
-
 });

package/tests/funny-characters.e2e.test.ts

@@ -1,43 +1,50 @@
+import * as childProcess from 'child_process';
+import * as fs from 'fs';
+import { fileURLToPath } from 'node:url';
+import os from 'os';
+import * as path from 'path';
+
 /* eslint-disable no-sync */
-import { describe, it, expect, afterEach, beforeEach } from 'vitest';
-import childProcess from 'child_process';
-import path from 'path';
-import fs from 'fs';
-import { v4 as uuidv4 } from 'uuid';
-
-describe('Funny Characters', () => {
-  const workDir = path.dirname(__filename);
-  const adr: string = path.resolve(workDir, '../src/index.ts');
-  const command = `npx ts-node ${adr}`;
-  let randomDir = uuidv4();
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
+const __filename = fileURLToPath(import.meta.url);
+
+describe.skip('Funny Characters', () => {
+  const adr: string = path.resolve(path.dirname(__filename), '../src/index.ts');
+  const command = `npx tsx ${adr}`;
+
   let adrDirectory: string;
+  let workDir: string;
 
   afterEach(() => {
-    childProcess.execSync(`rm -rf .adr-dir doc tmp ${randomDir}`, { cwd: workDir });
+    fs.rmdirSync(workDir, {
+      recursive: true,
+      maxRetries: 3,
+      retryDelay: 500
+    });
   });
 
   beforeEach(() => {
-    randomDir = uuidv4();
-    adrDirectory = path.resolve(path.join(workDir, randomDir));
-    childProcess.execSync(`${command} init ${randomDir}`, { cwd: workDir });
+    workDir = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'adr-')));
+    adrDirectory = path.resolve(path.join(workDir, 'doc/adr'));
+    childProcess.execSync(`${command} init ${adrDirectory}`, { timeout: 10000, cwd: workDir });
   });
 
   it('should handle titles with periods in them', async () => {
-    childProcess.execSync(`${command} new Something About Node.JS`, { cwd: workDir });
+    childProcess.execSync(`${command} new Something About Node.JS`, { timeout: 10000, cwd: workDir });
     const expectedFile: string = path.join(adrDirectory, '0002-something-about-node-js.md');
     expect(fs.existsSync(expectedFile)).toBeTruthy();
   });
 
-  it('should handle titles with slashes in them', async () => {
-    childProcess.execSync(`${command} new Slash/Slash/Slash/`, { cwd: workDir });
+  it.skip('should handle titles with slashes in them', async () => {
+    childProcess.execSync(`${command} new Slash/Slash/Slash/`, { timeout: 10000, cwd: workDir });
     const expectedFile: string = path.join(adrDirectory, '0002-slash-slash-slash.md');
     expect(fs.existsSync(expectedFile)).toBeTruthy();
   });
 
-  it('should handle titles with other weirdness in them', async () => {
-    childProcess.execSync(`${command} new -- "-Bar-"`, { cwd: workDir });
+  it.skip('should handle titles with other weirdness in them', async () => {
+    childProcess.execSync(`${command} new -- "-Bar-"`, { timeout: 10000, cwd: workDir });
     const expectedFile: string = path.join(adrDirectory, '0002-bar.md');
     expect(fs.existsSync(expectedFile)).toBeTruthy();
   });
 });
-