Skip to content

Commit

Permalink
fix: check matcher test types (4Catalyzer#1057)
Browse files Browse the repository at this point in the history
  • Loading branch information
steinybot committed Jan 31, 2024
1 parent 30d1415 commit f5d565d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"release": "4c release --conventional-commits",
"tdd": "jest --watch",
"test": "yarn lint && yarn test:ts && yarn testonly -- --coverage",
"test:ts": "dtslint --expectOnly types && yarn tsc --noEmit",
"test:ts": "dtslint --expectOnly types && yarn tsc --noEmit && yarn tsc --noEmit -p test",
"testonly": "jest --runInBand --verbose",
"docs": "yarn --cwd www start"
},
Expand Down
26 changes: 20 additions & 6 deletions test/Matcher.test.js → test/Matcher.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import Matcher from '../src/Matcher';
import {
type IsActiveOptions,
type LocationDescriptorObject,
Match,
} from '../src/typeUtils';

describe('Matcher', () => {
describe('route hierarchies', () => {
Expand Down Expand Up @@ -32,11 +37,11 @@ describe('Matcher', () => {
['nested matching', '/foo/bar', [0, 1]],
['route fallthrough', '/foo/baz', [2]],
].forEach(([scenario, pathname, expectedRouteIndices]) => {
describe(scenario, () => {
describe(scenario as string, () => {
it('should be supported', () => {
expect(
matcher.match({
pathname,
pathname: pathname as string,
}),
).toMatchObject({
routeIndices: expectedRouteIndices,
Expand Down Expand Up @@ -265,7 +270,7 @@ describe('Matcher', () => {
it(`should match ${scenario}`, () => {
expect(
matcher.match({
pathname,
pathname: pathname as string,
}),
).toMatchObject({
routeIndices: expectedRouteIndices,
Expand Down Expand Up @@ -350,7 +355,7 @@ describe('Matcher', () => {
});

describe('#joinPaths', () => {
const matcher = new Matcher();
const matcher = new Matcher([]);

[
['no extra slashes', '/foo', 'bar'],
Expand All @@ -359,6 +364,7 @@ describe('Matcher', () => {
['slashes everywhere', '/foo/', '/bar'],
].forEach(([scenario, basePath, path]) => {
it(`should support ${scenario}`, () => {
// @ts-ignore
expect(matcher.joinPaths(basePath, path)).toBe('/foo/bar');
});
});
Expand Down Expand Up @@ -415,7 +421,11 @@ describe('Matcher', () => {
].forEach(([scenario, matchLocation, location, options]) => {
it(`should be active on ${scenario}`, () => {
expect(
matcher.isActive({ location: matchLocation }, location, options),
matcher.isActive(
{ location: matchLocation } as any as Match,
location as LocationDescriptorObject,
options as IsActiveOptions,
),
).toBe(true);
});
});
Expand Down Expand Up @@ -459,7 +469,11 @@ describe('Matcher', () => {
].forEach(([scenario, matchLocation, location, options]) => {
it(`should not be active on ${scenario}`, () => {
expect(
matcher.isActive({ location: matchLocation }, location, options),
matcher.isActive(
{ location: matchLocation } as any as Match,
location as LocationDescriptorObject,
options as IsActiveOptions,
),
).toBe(false);
});
});
Expand Down
4 changes: 4 additions & 0 deletions test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../tsconfig.json",
"include": ["**/*.ts"]
}

0 comments on commit f5d565d

Please sign in to comment.