@neurodevs/meta-node 0.19.10 → 0.19.12

package/build/__tests__/AbstractPackageTest.d.ts

@@ -38,4 +38,5 @@ export default class AbstractPackageTest extends AbstractModuleTest {
     protected static setFakeKeybindingsFile(): void;
     protected static setFakeMetaNodeVersion(): void;
     protected static setFakeSnippetsFile(): void;
+    protected static generateId(): string;
 }

package/build/__tests__/AbstractPackageTest.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import { setFakeExecResult, setFakeReadFileResult, } from '@neurodevs/fake-node-core';
+import { generateShortId } from '@neurodevs/generate-id';
 import AbstractModuleTest from '@neurodevs/node-tdd';
 import expandHomeDir from '../functions/expandHomeDir.js';
 export default class AbstractPackageTest extends AbstractModuleTest {
@@ -55,5 +56,8 @@ export default class AbstractPackageTest extends AbstractModuleTest {
     static setFakeSnippetsFile() {
         setFakeReadFileResult(this.snippetsPath, this.originalSnippetsFile);
     }
+    static generateId() {
+        return generateShortId();
+    }
 }
 //# sourceMappingURL=AbstractPackageTest.js.map

package/build/__tests__/AbstractPackageTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPackageTest.js","sourceRoot":"","sources":["../../src/__tests__/AbstractPackageTest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractPackageTest.js","sourceRoot":"","sources":["../../src/__tests__/AbstractPackageTest.ts"],"names":[],"mappings":"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"}

package/build/__tests__/impl/NpmAutopackage.test.d.ts

@@ -1,13 +1,34 @@
 import AbstractPackageTest from '../AbstractPackageTest.js';
 export default class NpmAutopackageTest extends AbstractPackageTest {
     private static instance;
+    private static readonly installDir;
+    private static readonly description;
+    private static readonly gitNamespace;
+    private static readonly npmNamespace;
+    private static readonly keywords;
+    private static readonly license;
+    private static readonly author;
+    private static readonly githubToken;
+    private static readonly randomId;
+    private static readonly packageDir;
+    private static readonly packageJsonPath;
+    private static readonly gitignorePath;
+    private static readonly buildDirGitignorePattern;
+    private static readonly tasksJsonPath;
+    private static readonly testDirPath;
+    private static readonly abstractTestPath;
+    private static readonly setupVscodeCmd;
+    private static readonly checkGenerateIdVersionCmd;
+    private static readonly checkNodeTddVersionCmd;
+    private static readonly dependencies;
+    private static readonly yarnInstallDevDepsCommand;
+    private static readonly abstractTestFile;
+    private static readonly defaultOptions;
     protected static beforeEach(): Promise<void>;
     protected static createsInstance(): Promise<void>;
     protected static throwsIfGithubTokenNotSet(): Promise<void>;
     protected static firstCreateRepoInGithubOrg(): Promise<void>;
-    protected static thenChdirToInstallDir(): Promise<void>;
     protected static thenGitClone(): Promise<void>;
-    protected static thenChdirToPackageDir(): Promise<void>;
     protected static thenGitFetchOrigin(): Promise<void>;
     protected static thenGitFetchResetHard(): Promise<void>;
     protected static thenSpruceCreateModule(): Promise<void>;
@@ -27,6 +48,9 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     protected static thenInstallsAbstractPackageTest(): Promise<void>;
     protected static thenCommitsInstallAbstractPackageTest(): Promise<void>;
     protected static lastlyOpensVscodeAtEnd(): Promise<void>;
+    protected static installsDevDependenciesIfGenerateIdNotLatest(): Promise<void>;
+    protected static installsDevDependenciesIfNodeTddNotLatest(): Promise<void>;
+    protected static makeNpmNamespaceOptional(): Promise<void>;
     protected static doesNotCreateRepoInGithubOrgIfDone(): Promise<void>;
     protected static doesNotCloneRepoIfDone(): Promise<void>;
     protected static doesNotSpruceCreateModuleIfDone(): Promise<void>;
@@ -38,25 +62,14 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     protected static doesNotOverrideOriginalDependencies(): Promise<void>;
     protected static doesNotUpdateTasksJsonIfAlreadyDone(): Promise<void>;
     protected static doesNotOpenVscodeIfNotCloned(): Promise<void>;
-    protected static installsDevDependenciesIfGenerateIdNotLatest(): Promise<void>;
-    protected static installsDevDependenciesIfNodeTddNotLatest(): Promise<void>;
     protected static doesNotThrowIfGenerateIdNotInPackageJson(): Promise<void>;
     protected static doesNotInstallAbstractPackageTestIfTsExists(): Promise<void>;
     protected static doesNotInstallAbstractPackageTestIfTsxExists(): Promise<void>;
-    protected static makeNpmNamespaceOptional(): Promise<void>;
     private static run;
     private static createAndRunAutopackage;
     private static get scopedPackageName();
-    private static get packageDir();
-    private static readonly packageJsonPath;
-    private static readonly gitignorePath;
-    private static readonly buildDirGitignorePattern;
     private static get createModuleCmd();
-    private static readonly setupVscodeCmd;
-    private static readonly checkGenerateIdVersionCmd;
-    private static readonly checkNodeTddVersionCmd;
     private static orderJsonKeys;
-    private static fakeChdir;
     private static fakeExec;
     private static fakeFetch;
     private static fakeMkdir;
@@ -65,27 +78,11 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     private static fakeWriteFile;
     private static setFakeAutocommit;
     private static fakeFetchForRepoNotFound;
-    private static readonly installDir;
-    private static readonly name;
-    private static readonly description;
-    private static readonly gitNamespace;
-    private static readonly npmNamespace;
-    private static readonly keywords;
-    private static readonly license;
-    private static readonly author;
-    private static readonly githubToken;
-    private static readonly randomId;
     private static get reposUrl();
     private static get orgsUrl();
-    private static readonly dependencies;
     private static get originalPackageJson();
     private static get updatedPackageJson();
-    private static readonly tasksJsonPath;
     private static originalTasksJson;
     private static get updatedTasksJson();
-    private static readonly yarnInstallDevDepsCommand;
-    private static readonly abstractPackageTestPath;
-    private static readonly abstractPackageTestFile;
-    private static readonly defaultOptions;
     private static NpmAutopackage;
 }

package/build/__tests__/impl/NpmAutopackage.test.js

@@ -5,8 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { exec as execSync } from 'child_process';
+import path from 'path';
 import { promisify } from 'util';
-import { callsToChdir, callsToExec, callsToFetch, callsToMkdir, callsToReadFile, callsToWriteFile, fakeChdir, fakeExec, fakeFetch, fakeMkdir, fakePathExists, fakeReadFile, fakeWriteFile, resetCallsToChdir, resetCallsToExec, resetCallsToFetch, resetCallsToMkdir, resetCallsToPathExists, resetCallsToReadFile, resetCallsToWriteFile, setFakeExecResult, setFakeFetchResponse, setFakeReadFileResult, setPathShouldExist, } from '@neurodevs/fake-node-core';
+import { callsToExec, callsToFetch, callsToMkdir, callsToReadFile, callsToWriteFile, fakeExec, fakeFetch, fakeMkdir, fakePathExists, fakeReadFile, fakeWriteFile, resetCallsToExec, resetCallsToFetch, resetCallsToMkdir, resetCallsToPathExists, resetCallsToReadFile, resetCallsToWriteFile, setFakeExecResult, setFakeFetchResponse, setFakeReadFileResult, setPathShouldExist, } from '@neurodevs/fake-node-core';
 import { test, assert } from '@neurodevs/node-tdd';
 import GitAutocommit from '../../impl/GitAutocommit.js';
 import NpmAutopackage from '../../impl/NpmAutopackage.js';
@@ -15,9 +16,50 @@ import AbstractPackageTest from '../AbstractPackageTest.js';
 const exec = promisify(execSync);
 export default class NpmAutopackageTest extends AbstractPackageTest {
     static instance;
+    static installDir = this.generateId();
+    static description = this.generateId();
+    static gitNamespace = this.generateId();
+    static npmNamespace = this.generateId();
+    static keywords = [this.generateId(), this.generateId()];
+    static license = this.generateId();
+    static author = this.generateId();
+    static githubToken = this.generateId();
+    static randomId = this.generateId();
+    static packageDir = path.join(this.installDir, this.packageName);
+    static packageJsonPath = path.join(this.packageDir, 'package.json');
+    static gitignorePath = path.join(this.packageDir, '.gitignore');
+    static buildDirGitignorePattern = '\nbuild/\n';
+    static tasksJsonPath = path.join(this.packageDir, '.vscode', 'tasks.json');
+    static testDirPath = path.join(this.packageDir, 'src', '__tests__');
+    static abstractTestPath = path.join(this.testDirPath, 'AbstractPackageTest.ts');
+    static setupVscodeCmd = 'spruce setup.vscode --all true';
+    static checkGenerateIdVersionCmd = `yarn info @neurodevs/generate-id version --silent`;
+    static checkNodeTddVersionCmd = `yarn info @neurodevs/node-tdd version --silent`;
+    static dependencies = {
+        [this.generateId()]: this.generateId(),
+        [this.generateId()]: this.generateId(),
+    };
+    static yarnInstallDevDepsCommand = 'yarn add -D @neurodevs/generate-id@latest @neurodevs/node-tdd@latest';
+    static abstractTestFile = `import AbstractModuleTest from '@neurodevs/node-tdd'
+
+export default abstract class AbstractPackageTest extends AbstractModuleTest {
+    protected static async beforeEach() {
+        await super.beforeEach()
+    }
+}
+`;
+    static defaultOptions = {
+        installDir: this.installDir,
+        name: this.packageName,
+        description: this.description,
+        gitNamespace: this.gitNamespace,
+        npmNamespace: this.npmNamespace,
+        keywords: this.keywords,
+        license: this.license,
+        author: this.author,
+    };
     static async beforeEach() {
         await super.beforeEach();
-        this.fakeChdir();
         this.fakeExec();
         this.fakeFetch();
         this.fakeMkdir();
@@ -54,7 +96,7 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
                     'Content-Type': 'application/json',
                 },
                 body: JSON.stringify({
-                    name: this.name,
+                    name: this.packageName,
                     private: false,
                     description: this.description,
                     auto_init: true,
@@ -64,33 +106,37 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
             },
         }, 'Did not call fetch as expected!');
     }
-    static async thenChdirToInstallDir() {
-        await this.run();
-        assert.isEqual(callsToChdir[0], this.installDir, 'Did not change to installDir!');
-    }
     static async thenGitClone() {
         await this.run();
-        assert.isEqual(callsToExec[0]?.command, `git clone https://github.com/${this.gitNamespace}/${this.name}.git`, 'Did not call git clone!');
-    }
-    static async thenChdirToPackageDir() {
-        await this.run();
-        assert.isEqual(callsToChdir[1], this.packageDir, 'Did not change to packageDir!');
+        assert.isEqualDeep(callsToExec[0], {
+            command: `git clone https://github.com/${this.gitNamespace}/${this.packageName}.git`,
+            options: { cwd: this.installDir },
+        }, 'Did not call git clone!');
     }
     static async thenGitFetchOrigin() {
         await this.run();
-        assert.isEqual(callsToExec[1]?.command, `git fetch origin`, 'Did not call git fetch origin!');
+        assert.isEqualDeep(callsToExec[1], { command: `git fetch origin`, options: { cwd: this.packageDir } }, 'Did not call git fetch origin!');
     }
     static async thenGitFetchResetHard() {
         await this.run();
-        assert.isEqual(callsToExec[2]?.command, `git reset --hard origin/main`, 'Did not call git reset hard!');
+        assert.isEqualDeep(callsToExec[2], {
+            command: `git reset --hard origin/main`,
+            options: { cwd: this.packageDir },
+        }, 'Did not call git reset hard!');
     }
     static async thenSpruceCreateModule() {
         await this.run();
-        assert.isEqual(callsToExec[4]?.command, this.createModuleCmd, 'Did not call "spruce create.module"!');
+        assert.isEqualDeep(callsToExec[4], {
+            command: this.createModuleCmd,
+            options: { cwd: this.packageDir },
+        }, 'Did not call "spruce create.module"!');
     }
     static async thenCommitCreatePackage() {
         await this.run();
-        assert.isEqualDeep(FakeAutocommit.callsToConstructor[0]?.commitMessage, `patch: create package (@neurodevs/meta-node: ${this.metaNodeVersion})`, 'Did not commit create package changes!');
+        assert.isEqualDeep(FakeAutocommit.callsToConstructor[0], {
+            commitMessage: `patch: create package (@neurodevs/meta-node: ${this.metaNodeVersion})`,
+            cwd: this.packageDir,
+        }, 'Did not commit create package changes!');
     }
     static async thenReadPackageJson() {
         await this.run();
@@ -136,7 +182,10 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     }
     static async thenCommitUpdatePackage() {
         await this.run();
-        assert.isEqualDeep(FakeAutocommit.callsToConstructor[1]?.commitMessage, `patch: update package.json (@neurodevs/meta-node: ${this.metaNodeVersion})`, 'Did not commit update package changes!');
+        assert.isEqualDeep(FakeAutocommit.callsToConstructor[1], {
+            commitMessage: `patch: update package.json (@neurodevs/meta-node: ${this.metaNodeVersion})`,
+            cwd: this.packageDir,
+        }, 'Did not commit update package changes!');
     }
     static async thenAddBuildDirToGitignore() {
         await this.run();
@@ -148,15 +197,24 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     }
     static async thenCommitUpdateGitignore() {
         await this.run();
-        assert.isEqualDeep(FakeAutocommit.callsToConstructor[2]?.commitMessage, `patch: add build dir to gitignore (@neurodevs/meta-node: ${this.metaNodeVersion})`, 'Did not commit .gitignore changes!');
+        assert.isEqualDeep(FakeAutocommit.callsToConstructor[2], {
+            commitMessage: `patch: add build dir to gitignore (@neurodevs/meta-node: ${this.metaNodeVersion})`,
+            cwd: this.packageDir,
+        }, 'Did not commit .gitignore changes!');
     }
     static async thenSpruceSetupVscode() {
         await this.run();
-        assert.isEqual(callsToExec[5]?.command, this.setupVscodeCmd, 'Did not call "spruce setup.vscode"!');
+        assert.isEqualDeep(callsToExec[5], {
+            command: this.setupVscodeCmd,
+            options: { cwd: this.packageDir },
+        }, 'Did not call "spruce setup.vscode"!');
     }
     static async thenCommitVscodeChanges() {
         await this.run();
-        assert.isEqualDeep(FakeAutocommit.callsToConstructor[3]?.commitMessage, `patch: setup vscode (@neurodevs/meta-node: ${this.metaNodeVersion})`, 'Did not commit vscode changes!');
+        assert.isEqualDeep(FakeAutocommit.callsToConstructor[3], {
+            commitMessage: `patch: setup vscode (@neurodevs/meta-node: ${this.metaNodeVersion})`,
+            cwd: this.packageDir,
+        }, 'Did not commit vscode changes!');
     }
     static async thenUpdatesVscodeTasksJson() {
         await this.run();
@@ -168,38 +226,83 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     }
     static async thenCommitsUpdateVscodeTasksJson() {
         await this.run();
-        assert.isEqualDeep(FakeAutocommit.callsToConstructor[4]?.commitMessage, `patch: update vscode tasks.json (@neurodevs/meta-node: ${this.metaNodeVersion})`, 'Did not commit updated vscode tasks.json changes!');
+        assert.isEqualDeep(FakeAutocommit.callsToConstructor[4], {
+            commitMessage: `patch: update vscode tasks.json (@neurodevs/meta-node: ${this.metaNodeVersion})`,
+            cwd: this.packageDir,
+        }, 'Did not commit updated vscode tasks.json changes!');
     }
     static async thenInstallsDefaultDevDependencies() {
         await this.run();
-        assert.isEqual(callsToExec[8]?.command, this.yarnInstallDevDepsCommand, 'Did not install default devDependencies!');
+        assert.isEqualDeep(callsToExec[8], {
+            command: this.yarnInstallDevDepsCommand,
+            options: { cwd: this.packageDir },
+        }, 'Did not install default devDependencies!');
     }
     static async thenCommitsInstallDefaultDevDependencies() {
         await this.run();
-        assert.isEqualDeep(FakeAutocommit.callsToConstructor[5]?.commitMessage, `patch: install default devDependencies (@neurodevs/meta-node: ${this.metaNodeVersion})`, 'Did not commit install devDependencies changes!');
+        assert.isEqualDeep(FakeAutocommit.callsToConstructor[5], {
+            commitMessage: `patch: install default devDependencies (@neurodevs/meta-node: ${this.metaNodeVersion})`,
+            cwd: this.packageDir,
+        }, 'Did not commit install devDependencies changes!');
     }
     static async thenInstallsTestsDirectory() {
         await this.run();
         assert.isEqualDeep(callsToMkdir[0], {
-            path: 'src/__tests__',
+            path: this.testDirPath,
             options: { recursive: true },
         }, 'Did not install tests directory!');
     }
     static async thenInstallsAbstractPackageTest() {
         await this.run();
         assert.isEqualDeep(callsToWriteFile[3], {
-            file: this.abstractPackageTestPath,
-            data: this.abstractPackageTestFile,
+            file: this.abstractTestPath,
+            data: this.abstractTestFile,
             options: { encoding: 'utf-8' },
         }, 'Did not install AbstractPackageTest!');
     }
     static async thenCommitsInstallAbstractPackageTest() {
         await this.run();
-        assert.isEqualDeep(FakeAutocommit.callsToConstructor[6]?.commitMessage, `patch: install AbstractPackageTest (@neurodevs/meta-node: ${this.metaNodeVersion})`, 'Did not commit install AbstractPackageTest changes!');
+        assert.isEqualDeep(FakeAutocommit.callsToConstructor[6], {
+            commitMessage: `patch: install AbstractPackageTest (@neurodevs/meta-node: ${this.metaNodeVersion})`,
+            cwd: this.packageDir,
+        }, 'Did not commit install AbstractPackageTest changes!');
     }
     static async lastlyOpensVscodeAtEnd() {
         await this.run();
-        assert.isEqual(callsToExec[9]?.command, 'code .', 'Did not open vscode at end!');
+        assert.isEqualDeep(callsToExec[9], { command: 'code .', options: { cwd: this.packageDir } }, 'Did not open vscode at end!');
+    }
+    static async installsDevDependenciesIfGenerateIdNotLatest() {
+        setFakeExecResult(this.checkGenerateIdVersionCmd, {
+            stdout: '0.0.1',
+        });
+        await this.createAndRunAutopackage();
+        const calls = callsToExec.filter((call) => call?.command === this.yarnInstallDevDepsCommand);
+        assert.isEqualDeep(calls[0], {
+            command: this.yarnInstallDevDepsCommand,
+            options: { cwd: this.packageDir },
+        }, 'Should install default devDependencies if not already installed!');
+    }
+    static async installsDevDependenciesIfNodeTddNotLatest() {
+        setFakeExecResult(this.checkGenerateIdVersionCmd, {
+            stdout: '1.0.0',
+        });
+        setFakeExecResult(this.checkNodeTddVersionCmd, {
+            stdout: '0.0.1',
+        });
+        await this.createAndRunAutopackage();
+        const calls = callsToExec.filter((call) => call?.command === this.yarnInstallDevDepsCommand);
+        assert.isEqualDeep(calls[0], {
+            command: this.yarnInstallDevDepsCommand,
+            options: { cwd: this.packageDir },
+        }, 'Should install default devDependencies if not already installed!');
+    }
+    static async makeNpmNamespaceOptional() {
+        resetCallsToWriteFile();
+        const instance = this.NpmAutopackage({
+            npmNamespace: undefined,
+        });
+        await instance.run();
+        assert.doesInclude(callsToWriteFile[0]?.data, `"name": "${this.packageName}"`, 'Did not handle missing npmNamespace!');
     }
     static async doesNotCreateRepoInGithubOrgIfDone() {
         const fakeResponse = new Response(null, {
@@ -214,7 +317,7 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     static async doesNotCloneRepoIfDone() {
         await this.createAndRunAutopackage();
         assert.isEqual(callsToExec.filter((call) => call?.command ===
-            `git clone https://github.com/${this.gitNamespace}/${this.name}.git`).length, 1, 'Did not clone repo once!');
+            `git clone https://github.com/${this.gitNamespace}/${this.packageName}.git`).length, 1, 'Did not clone repo once!');
     }
     static async doesNotSpruceCreateModuleIfDone() {
         await this.createAndRunAutopackage();
@@ -257,53 +360,26 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
             .length, 0, 'Did not update tasks.json once!');
     }
     static async doesNotOpenVscodeIfNotCloned() {
-        setPathShouldExist(this.name, true);
+        setPathShouldExist(this.packageDir, true);
         await this.createAndRunAutopackage();
         assert.isFalse(callsToExec.some((call) => call?.command === 'code .'), 'Should not open vscode if not cloned!');
     }
-    static async installsDevDependenciesIfGenerateIdNotLatest() {
-        setFakeExecResult(this.checkGenerateIdVersionCmd, {
-            stdout: '0.0.1',
-        });
-        await this.createAndRunAutopackage();
-        const calls = callsToExec.filter((call) => call?.command === this.yarnInstallDevDepsCommand);
-        assert.isEqual(calls.length, 1, 'Should not install default devDependencies if already installed!');
-    }
-    static async installsDevDependenciesIfNodeTddNotLatest() {
-        setFakeExecResult(this.checkGenerateIdVersionCmd, {
-            stdout: '1.0.0',
-        });
-        setFakeExecResult(this.checkNodeTddVersionCmd, {
-            stdout: '0.0.1',
-        });
-        await this.createAndRunAutopackage();
-        const calls = callsToExec.filter((call) => call?.command === this.yarnInstallDevDepsCommand);
-        assert.isEqual(calls.length, 1, 'Should not install default devDependencies if already installed!');
-    }
     static async doesNotThrowIfGenerateIdNotInPackageJson() {
         setFakeReadFileResult(this.packageJsonPath, this.originalPackageJson.replace('@neurodevs/generate-id', ''));
         await this.createAndRunAutopackage();
     }
     static async doesNotInstallAbstractPackageTestIfTsExists() {
-        setPathShouldExist(this.abstractPackageTestPath, true);
+        setPathShouldExist(this.abstractTestPath, true);
         await this.createAndRunAutopackage();
-        const calls = callsToWriteFile.filter((call) => call.file === this.abstractPackageTestPath);
+        const calls = callsToWriteFile.filter((call) => call.file === this.abstractTestPath);
         assert.isEqual(calls.length, 0, 'Should not install AbstractPackageTest.ts if already exists!');
     }
     static async doesNotInstallAbstractPackageTestIfTsxExists() {
-        setPathShouldExist(`${this.abstractPackageTestPath}x`, true);
+        setPathShouldExist(`${this.abstractTestPath}x`, true);
         await this.createAndRunAutopackage();
-        const calls = callsToWriteFile.filter((call) => call.file === this.abstractPackageTestPath);
+        const calls = callsToWriteFile.filter((call) => call.file === this.abstractTestPath);
         assert.isEqual(calls.length, 0, 'Should not install AbstractPackageTest.tsx if already exists!');
     }
-    static async makeNpmNamespaceOptional() {
-        resetCallsToWriteFile();
-        const instance = this.NpmAutopackage({
-            npmNamespace: undefined,
-        });
-        await instance.run();
-        assert.doesInclude(callsToWriteFile[0]?.data, `"name": "${this.name}"`, 'Did not handle missing npmNamespace!');
-    }
     static async run() {
         await this.instance.run();
     }
@@ -312,20 +388,11 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
         await instance.run();
     }
     static get scopedPackageName() {
-        return `@${this.npmNamespace}/${this.name}`;
+        return `@${this.npmNamespace}/${this.packageName}`;
     }
-    static get packageDir() {
-        return this.name;
-    }
-    static packageJsonPath = 'package.json';
-    static gitignorePath = '.gitignore';
-    static buildDirGitignorePattern = '\nbuild/\n';
     static get createModuleCmd() {
-        return `spruce create.module --name "${this.name}" --destination "." --description "${this.description}"`;
+        return `spruce create.module --name "${this.packageName}" --destination "." --description "${this.description}"`;
     }
-    static setupVscodeCmd = 'spruce setup.vscode --all true';
-    static checkGenerateIdVersionCmd = `yarn info @neurodevs/generate-id version --silent`;
-    static checkNodeTddVersionCmd = `yarn info @neurodevs/node-tdd version --silent`;
     static orderJsonKeys(json, keyOrder) {
         const ordered = {};
         for (const key of keyOrder) {
@@ -341,10 +408,6 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
         }
         return ordered;
     }
-    static fakeChdir() {
-        NpmAutopackage.chdir = fakeChdir;
-        resetCallsToChdir();
-    }
     static fakeExec() {
         NpmAutopackage.exec = fakeExec;
         resetCallsToExec();
@@ -361,7 +424,7 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
     static fakePathExists() {
         NpmAutopackage.pathExists = fakePathExists;
         resetCallsToPathExists();
-        setPathShouldExist(this.abstractPackageTestPath, false);
+        setPathShouldExist(this.abstractTestPath, false);
     }
     static fakeReadFile() {
         NpmAutopackage.readFile = fakeReadFile;
@@ -384,29 +447,15 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
         });
         setFakeFetchResponse(this.reposUrl, fakeResponse);
     }
-    static installDir = this.generateId();
-    static name = this.generateId();
-    static description = this.generateId();
-    static gitNamespace = this.generateId();
-    static npmNamespace = this.generateId();
-    static keywords = [this.generateId(), this.generateId()];
-    static license = this.generateId();
-    static author = this.generateId();
-    static githubToken = this.generateId();
-    static randomId = this.generateId();
     static get reposUrl() {
-        return `https://api.github.com/repos/${this.gitNamespace}/${this.name}`;
+        return `https://api.github.com/repos/${this.gitNamespace}/${this.packageName}`;
     }
     static get orgsUrl() {
         return `https://api.github.com/orgs/${this.gitNamespace}/repos`;
     }
-    static dependencies = {
-        [this.generateId()]: this.generateId(),
-        [this.generateId()]: this.generateId(),
-    };
     static get originalPackageJson() {
         return JSON.stringify({
-            name: this.name,
+            name: this.packageName,
             description: 'Old description',
             dependencies: this.dependencies,
             devDependencies: {
@@ -424,18 +473,17 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
             license: this.license,
             author: this.author,
             main: 'build/index.js',
-            homepage: `https://github.com/${this.gitNamespace}/${this.name}`,
+            homepage: `https://github.com/${this.gitNamespace}/${this.packageName}`,
             repository: {
                 type: 'git',
-                url: `git+https://github.com/${this.gitNamespace}/${this.name}.git`,
+                url: `git+https://github.com/${this.gitNamespace}/${this.packageName}.git`,
             },
             bugs: {
-                url: `https://github.com/${this.gitNamespace}/${this.name}/issues`,
+                url: `https://github.com/${this.gitNamespace}/${this.packageName}/issues`,
             },
             dependencies: this.dependencies,
         });
     }
-    static tasksJsonPath = '.vscode/tasks.json';
     static originalTasksJson = {
         [this.randomId]: this.randomId,
         tasks: [
@@ -478,26 +526,6 @@ export default class NpmAutopackageTest extends AbstractPackageTest {
             ],
         }, null, 4);
     }
-    static yarnInstallDevDepsCommand = 'yarn add -D @neurodevs/generate-id@latest @neurodevs/node-tdd@latest';
-    static abstractPackageTestPath = 'src/__tests__/AbstractPackageTest.ts';
-    static abstractPackageTestFile = `import AbstractModuleTest from '@neurodevs/node-tdd'
-
-export default abstract class AbstractPackageTest extends AbstractModuleTest {
-    protected static async beforeEach() {
-        await super.beforeEach()
-    }
-}
-`;
-    static defaultOptions = {
-        installDir: this.installDir,
-        name: this.name,
-        description: this.description,
-        gitNamespace: this.gitNamespace,
-        npmNamespace: this.npmNamespace,
-        keywords: this.keywords,
-        license: this.license,
-        author: this.author,
-    };
     static NpmAutopackage(options) {
         return NpmAutopackage.Create({ ...this.defaultOptions, ...options });
     }
@@ -511,15 +539,9 @@ __decorate([
 __decorate([
     test()
 ], NpmAutopackageTest, "firstCreateRepoInGithubOrg", null);
-__decorate([
-    test()
-], NpmAutopackageTest, "thenChdirToInstallDir", null);
 __decorate([
     test()
 ], NpmAutopackageTest, "thenGitClone", null);
-__decorate([
-    test()
-], NpmAutopackageTest, "thenChdirToPackageDir", null);
 __decorate([
     test()
 ], NpmAutopackageTest, "thenGitFetchOrigin", null);
@@ -577,6 +599,15 @@ __decorate([
 __decorate([
     test()
 ], NpmAutopackageTest, "lastlyOpensVscodeAtEnd", null);
+__decorate([
+    test()
+], NpmAutopackageTest, "installsDevDependenciesIfGenerateIdNotLatest", null);
+__decorate([
+    test()
+], NpmAutopackageTest, "installsDevDependenciesIfNodeTddNotLatest", null);
+__decorate([
+    test()
+], NpmAutopackageTest, "makeNpmNamespaceOptional", null);
 __decorate([
     test()
 ], NpmAutopackageTest, "doesNotCreateRepoInGithubOrgIfDone", null);
@@ -610,12 +641,6 @@ __decorate([
 __decorate([
     test()
 ], NpmAutopackageTest, "doesNotOpenVscodeIfNotCloned", null);
-__decorate([
-    test()
-], NpmAutopackageTest, "installsDevDependenciesIfGenerateIdNotLatest", null);
-__decorate([
-    test()
-], NpmAutopackageTest, "installsDevDependenciesIfNodeTddNotLatest", null);
 __decorate([
     test()
 ], NpmAutopackageTest, "doesNotThrowIfGenerateIdNotInPackageJson", null);
@@ -625,7 +650,4 @@ __decorate([
 __decorate([
     test()
 ], NpmAutopackageTest, "doesNotInstallAbstractPackageTestIfTsxExists", null);
-__decorate([
-    test()
-], NpmAutopackageTest, "makeNpmNamespaceOptional", null);
 //# sourceMappingURL=NpmAutopackage.test.js.map