Commit 2d958c5

authored

fix: extract router params in navigate (testing-library#93)

1 parent 4cb5e5c commit 2d958c5Copy full SHA for 2d958c5

File tree

+27

-2

lines changed

+27

-2

lines changed

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,28 @@ export async function render<SutType, WrapperType = SutType>(`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`const href = typeof elementOrPath === 'string' ? elementOrPath : elementOrPath.getAttribute('href');`
	`124`	`+ const [path, params] = (basePath + href).split('?');`
	`125`	`+ const queryParams = params`
	`126`	`+ ? params.split('&').reduce((qp, q) => {`
	`127`	`+ const [key, value] = q.split('=');`
	`128`	`+ qp[key] = value;`
	`129`	`+ return qp;`
	`130`	`+ }, {})`
	`131`	`+ : undefined;`
	`132`	`+`
	`133`	`+ const doNavigate = () =>`
	`134`	`+ router.navigate([path], {`
	`135`	`+ queryParams,`
	`136`	`+ });`
`124`	`137`
`125`	`138`	`let result;`
`126`		`- await zone.run(() => (result = router.navigate([basePath + href])));`
	`139`	`+`
	`140`	`+ if (zone) {`
	`141`	`+ await zone.run(() => (result = doNavigate()));`
	`142`	`+ } else {`
	`143`	`+ result = doNavigate();`
	`144`	`+ }`
	`145`	`+`
`127`	`146`	`detectChanges();`
`128`	`147`	`return result;`
`129`	`148`	`};`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,10 @@ test('it can navigate to routes with a base path', async () => {`
`73`	`73`	`await navigate(screen.getByText(/Backtoparent/));`
`74`	`74`	`expect(screen.queryByText(/Detailthree/i)).not.toBeInTheDocument();`
`75`	`75`
`76`		`- await navigate('base/detail/two'); // possible to just use strings`
	`76`	`+ await navigate('base/detail/two?text=Hello&subtext=World'); // possible to just use strings`
`77`	`77`	`expect(screen.queryByText(/Detailtwo/i)).toBeInTheDocument();`
	`78`	`+ expect(screen.queryByText(/HelloWorld/i)).toBeInTheDocument();`
	`79`	`+`
`78`	`80`	`await navigate('/hidden-detail', basePath);`
`79`	`81`	`expect(screen.queryByText(/Youfoundthetreasure!/i)).toBeInTheDocument();`
`80`	`82`	`});`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,16 @@ export class MasterComponent {}`
`20`	`20`	template: `
`21`	`21`	`<h2>Detail {{ id \| async }}</h2>`
`22`	`22`
	`23`	`+ <p>{{ text \| async }} {{ subtext \| async }}</p>`
	`24`	`+`
`23`	`25`	`<a [routerLink]="'../..'">Back to parent</a>`
`24`	`26`	`<a routerLink="/hidden-detail">hidden x</a>`
`25`	`27`	`,
`26`	`28`	`})`
`27`	`29`	`export class DetailComponent {`
`28`	`30`	`id = this.route.paramMap.pipe(map(params => params.get('id')));`
	`31`	`+ text = this.route.queryParams.pipe(map(params => params['text']));`
	`32`	`+ subtext = this.route.queryParams.pipe(map(params => params['subtext']));`
`29`	`33`	`constructor(private route: ActivatedRoute) {}`
`30`	`34`	`}`
`31`	`35`

Comments

(0)