fix: re-establish 100% test coverage and improve tests

peerigon · Sep 18, 2020 · 7618d01 · 7618d01
1 parent 2f1d1a5
commit 7618d01
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/src/cliConfig.ts b/src/cliConfig.ts
@@ -27,7 +27,8 @@ export default (argv: Array<string>): CliConfig => {
 
 	program.parse(argv);
 
-	const cliConfig: CliConfig = { packageFile };
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+	const cliConfig: CliConfig = { packageFile: packageFile ?? process.cwd() };
 
 	if (program.fix !== undefined) {
 		cliConfig.fix = program.fix;

diff --git a/src/cliModule.ts b/src/cliModule.ts
@@ -27,6 +27,7 @@ export default (argv: Array<string>) => {
 
 		const userConfig = loadUserConfig();
 		const cliConfig = loadCliConfig(argv);
+
 		const config = {
 			...DEFAULT_CONFIG,
 			...{ json: false },
@@ -50,7 +51,7 @@ export default (argv: Array<string>) => {
 			writePackageScripts,
 			readPackageScripts,
 		} = userPackageScriptContext(
-			makePackageFilePath(config.packageFile ?? process.cwd())
+			makePackageFilePath(config.packageFile)
 		);
 
 		const scripts = readPackageScripts(config.ignoreScripts);

diff --git a/src/constants.ts b/src/constants.ts
@@ -8,7 +8,7 @@ export const DEFAULT_CONFIG: Config = {
 	fix: false,
 	json: false,
 	config: false,
-	packageFile: undefined,
+	packageFile: process.cwd(),
 	rules: {},
 	customRules: [],
 	ignoreScripts: [],

diff --git a/src/module.ts b/src/module.ts
@@ -34,7 +34,7 @@ export default (moduleConfig: Partial<Config>) => {
 
 	if (!moduleConfig.packageScripts && moduleConfig.packageFile) {
 		const { readPackageScripts } = userPackageScriptContext(
-			makePackageFilePath(config.packageFile ?? "")
+			makePackageFilePath(config.packageFile)
 		);
 
 		scripts = readPackageScripts(config.ignoreScripts);

diff --git a/src/types.ts b/src/types.ts
@@ -17,7 +17,7 @@ export type PackageScripts = {
 
 export type Config = {
 	strict: boolean;
-	packageFile?: string;
+	packageFile: string;
 	packageScripts?: PackageScripts;
 	fix: boolean;
 	json: boolean;

diff --git a/tests/cliConfig.test.ts b/tests/cliConfig.test.ts
@@ -51,7 +51,7 @@ describe("cliConfig.ts", () => {
 			"-f",
 		]);
 
-		expect(packageFile).not.toBeDefined();
+		expect(packageFile).toEqual(process.cwd());
 
 		expect(config).toEqual({
 			fix: true,

diff --git a/tests/userConfig.test.ts b/tests/userConfig.test.ts
@@ -5,6 +5,7 @@ const validConfig = {
 	strict: true,
 	fix: false,
 	json: false,
+	packageFile: "/foo/bar/baz",
 	config: false,
 	rules: { foo: "bar" },
 	ignoreScripts: ["foo"],
@@ -41,7 +42,7 @@ describe("userConfig.ts", () => {
 	test("loadConfig()", () => {
 		const loaded = loadConfig();
 
-		expect(loaded).toMatchSnapshot();
+		expect({...loaded, packageFile: undefined}).toMatchSnapshot();
 	});
 
 	test("loadConfig() with config missing", () => {