Skip to content

Commit

Permalink
fix(utils): support star matching
Browse files Browse the repository at this point in the history
support star matching in domain and path in regex
  • Loading branch information
nicko-winner committed Dec 8, 2023
1 parent 0740611 commit c806354
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ yarn-error.log
# eslint
.eslintcache

# ide
.idea

.env
21 changes: 21 additions & 0 deletions packages/example/tests/playwright/specs/http.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,25 @@ test.describe.parallel('HTTP example: users list', () => {
await page.goto('/users/testmytestface');
await expect(page.locator('text="[email protected]"')).toBeVisible();
});

test('should allow paths with route with `*` to be mocked', async ({
page,
worker,
}) => {
await worker.use(
http.get('/a*i/us*/:userId', () =>
HttpResponse.json({
id: 'testmytestface',
firstName: 'Testy',
lastName: 'Mctestface',
dob: '1969-6-9',
email: '[email protected]',
address: '111 Testy Way',
phoneNumber: '(123) 456-7890',
}),
),
);
await page.goto('/users/testmytestface');
await expect(page.locator('text="[email protected]"')).toBeVisible();
});
});
9 changes: 8 additions & 1 deletion packages/playwright-msw/src/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,18 @@ describe('utils', () => {
${'https://www.google.com.au/:potato/:eggplant/'} | ${'https://www.google.com.au/search/something/?foo=bar'} | ${true}
${'https://www.google.com.au/:potato/:eggplant?foo=bar'} | ${'https://www.google.com.au/search/something'} | ${true}
${'https://www.google.com.au/:potato/:eggplant/?foo=bar'} | ${'https://www.google.com.au/search/something/'} | ${true}
${'https://www.google.com.au/*/?foo=bar'} | ${'https://www.google.com.au/search/something/?foo=bar'} | ${true}
${'https://www.google.com.au/search'} | ${'https://different.domain/search'} | ${false}
${'http://www.google.com.au/:something/'} | ${'http://www.google.com.au/search/?q=potato'} | ${true}
${'*/api/users'} | ${'http://localhost:8080/api/users'} | ${true}
${'http://localhost:8080/api/users'} | ${'http://localhost:8080/api/users'} | ${true}
${'http://localhost:8081/api/users'} | ${'http://localhost:8080/api/users'} | ${false}
${'*'} | ${'http://anything.com/will/match?q=really'} | ${true}
${'http://api.*.foo.com/life/power'} | ${'http://api.dev.foo.com/life/power'} | ${true}
${'http://*.foo.com/life/power'} | ${'http://api.dev.foo.com/life/power'} | ${true}
${'http://b.co/api/*/*'} | ${'http://b.co/api/users/foo'} | ${true}
${'http://b.co/p/https%3A%2F%2Fa.*%2F*%2Fsecond'} | ${'http://b.co/p/https%3A%2F%2Fa.co%2Ffirst%2Fsecond'} | ${true}
${'*/api/users'} | ${'http://localhost:8080/api/users'} | ${true}
${'*/*/users'} | ${'http://localhost:8080/api/users'} | ${true}
`(
'$expected: "$mswPath" should match "$playwrightUrl"',
({ mswPath, playwrightUrl, expected }) => {
Expand Down
27 changes: 24 additions & 3 deletions packages/playwright-msw/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,30 @@ export const getHandlerPath = (
return (handler.info as unknown as { path: string }).path;
};

const getOriginRegex = (origin) => {
if (origin === '*') {
return '.*';
}
return (
(origin ?? '')
// escape dots in domains, for more exact matches
.replace(/\./, '.')
// support wildcard star matches
.replace('*', '.*') || '(\\w+://[^/]+)?'
);
};

export const convertMswPathToPlaywrightUrl = (path: Path): RegExp => {
// If already a regex, just return straight away
if (path instanceof RegExp) {
return path;
}

// A route that matches everything for testing
if (path === '*') {
return /.*/;
}

// Deconstruct path
const { origin, pathname } =
path.match(
Expand All @@ -54,9 +72,12 @@ export const convertMswPathToPlaywrightUrl = (path: Path): RegExp => {
return new RegExp(
[
'^',
origin === '*' ? '.*' : origin ?? '(\\w+://[^/]+)?',
// Replace route parameters (`:whatever`) with multi-char wildcard
pathname.replace(/:[^/]+/g, '[^/]+'),
getOriginRegex(origin),
pathname
// support star matching
.replace(/\*/g, '.*')
// Replace route parameters (`:whatever`) with multi-char wildcard
.replace(/:[^/]+/g, '[^/]+'),
// Add optional trailing slash
'\\/?',
// Add optional query parameters
Expand Down

0 comments on commit c806354

Please sign in to comment.