Skip to content

Commit 921621e

Browse files
committed
test: fix test typing issues
1 parent f626df7 commit 921621e

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

@commitlint/config-validator/src/validate.test.ts

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {validateConfig} from './validate';
21
import {RuleConfigSeverity, UserConfig} from '@commitlint/types';
32

3+
import {validateConfig} from './validate.js';
4+
45
const validSchemas: Record<string, UserConfig> = {
56
empty: {},
67
withEmptyExtends: {extends: []},
@@ -9,7 +10,13 @@ const validSchemas: Record<string, UserConfig> = {
910
withMultipleExtends: {extends: ['test', 'test2']},
1011
withFormatter: {formatter: ''},
1112
withHelpUrl: {helpUrl: ''},
12-
withRules: {rules: {a: [RuleConfigSeverity.Disabled], b: [RuleConfigSeverity.Warning, 'never'], c: [RuleConfigSeverity.Error, 'never', true]}},
13+
withRules: {
14+
rules: {
15+
a: [RuleConfigSeverity.Disabled],
16+
b: [RuleConfigSeverity.Warning, 'never'],
17+
c: [RuleConfigSeverity.Error, 'never', true],
18+
},
19+
},
1320
withParserPresetString: {parserPreset: 'test'},
1421
withParserPresetObject: {parserPreset: {}},
1522
withParserPresetObject2: {parserPreset: {name: 'string', path: 'string'}},

@commitlint/cz-commitlint/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"outDir": "./lib"
77
},
88
"include": ["./src"],
9-
"exclude": ["./src/**/*.test.ts", "./lib/**/*"],
9+
"exclude": ["./src/**/*.test.ts", "./src/**/*-test.ts", "./lib/**/*"],
1010
"references": [{"path": "../cli"}]
1111
}

@commitlint/rules/src/header-trim.test.ts

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import parse from '@commitlint/parse';
2-
import {Commit} from '@commitlint/types';
3-
import {headerTrim} from './header-trim';
2+
import type {Commit} from 'conventional-commits-parser';
3+
4+
import {headerTrim} from './header-trim.js';
45

56
const messages = {
67
correct: 'test: subject',
@@ -18,10 +19,13 @@ const messages = {
1819
mixSurround: '\t \ttest: subject \t \t',
1920
};
2021

21-
const parsed = Object.entries(messages).reduce((_parsed, [key, message]) => {
22-
_parsed[key] = parse(message);
23-
return _parsed;
24-
}, {}) as Record<keyof typeof messages, Promise<Commit>>;
22+
const parsed = Object.entries(messages).reduce(
23+
(_parsed, [key, message]) =>
24+
Object.assign(_parsed, {
25+
[key]: parse(message),
26+
}),
27+
{} as Record<keyof typeof messages, Promise<Commit>>
28+
);
2529

2630
test('should succeed when header is not surrounded by whitespace', async () => {
2731
const result = headerTrim(await parsed.correct);

@commitlint/rules/src/header-trim.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {SyncRule} from '@commitlint/types';
44
export const headerTrim: SyncRule = (parsed) => {
55
const {header} = parsed;
66

7-
const startsWithWhiteSpace = header !== header.trimStart();
8-
const endsWithWhiteSpace = header !== header.trimEnd();
7+
const startsWithWhiteSpace = header !== header?.trimStart();
8+
const endsWithWhiteSpace = header !== header?.trimEnd();
99

1010
switch (true) {
1111
case startsWithWhiteSpace && endsWithWhiteSpace:

tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"extends": "./tsconfig.shared.json",
33
"files": [],
4-
"include": ["./auto-imports.d.ts", "./**/*.test.ts"],
5-
"exclude": ["./**/lib/*.test.ts"],
4+
"include": ["./auto-imports.d.ts", "./**/*.test.ts", "./**/*-test.ts"],
5+
"exclude": ["./**/lib/*.ts"],
66
"compilerOptions": {
77
"noEmit": true
88
},

0 commit comments

Comments
 (0)