update tests

Author: developit

router.js

@@ -45,7 +45,9 @@ export const exec = (url, route, matches) => {
 		// normal/optional field:
 		else if (val) val = decodeURIComponent(val);
 		matches.params[param] = val;
-		if (param != 'ref' && param != 'key' && param != 'path' && param != 'query' && param != 'params') matches[param] = val;
+		if (param != 'ref' && param != 'key' && param != 'path' && param != 'query' && param != 'params') {
+			matches[param] = val;
+		}
 		if (rest) break;
 	}
 	return matches;

test/match.test.js

@@ -15,15 +15,15 @@ describe('match', () => {
 
 	it('Param route', () => {
 		const accurateResult = doExec('/user/2', '/user/:id');
-		expect(accurateResult).toEqual({ path: '/', params: { id: '2' }, query: {} });
+		expect(accurateResult).toEqual({ path: '/user/2', params: { id: '2' }, query: {}, id: '2' });
 
 		const inaccurateResult = doExec('/', '/user/:id');
 		expect(inaccurateResult).toEqual(undefined);
 	});
 
 	it('Optional param route', () => {
 		const accurateResult = doExec('/user', '/user/:id?');
-		expect(accurateResult).toEqual({ path: '/', params: { id: undefined }, query: {} });
+		expect(accurateResult).toEqual({ path: '/user', params: { id: undefined }, query: {} });
 
 		const inaccurateResult = doExec('/', '/user/:id?');
 		expect(inaccurateResult).toEqual(undefined);
@@ -37,7 +37,9 @@ describe('match', () => {
 				seg2: '_SEGMENT2_'
 			},
 			path: '/about-late/_SEGMENT1_/_SEGMENT2_/',
-			query: {}
+			query: {},
+			seg1: '_SEGMENT1_',
+			seg2: '_SEGMENT2_'
 		});
 	});
 

test/router.test.js

@@ -82,7 +82,7 @@ describe('Router', () => {
 		expect(Home).not.toHaveBeenCalled();
 		expect(Profiles).not.toHaveBeenCalled();
 		expect(Profile).toHaveBeenCalledWith(
-			{ path: '/profiles/bob', query: {}, params: { id: 'bob' } },
+			{ path: '/profiles/bob', query: {}, params: { id: 'bob' }, id: 'bob' },
 			expect.anything()
 		);
 		expect(Fallback).not.toHaveBeenCalled();