From a2679be97f474dbbb23b718150ebba1a7f652b98 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 17 Jan 2019 03:03:50 +0100 Subject: [PATCH] FIX current can be undefined in test --- lib/router/src/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/router/src/utils.ts b/lib/router/src/utils.ts index 7d97d8dd486..f9a2962a5e8 100644 --- a/lib/router/src/utils.ts +++ b/lib/router/src/utils.ts @@ -32,9 +32,9 @@ export const queryFromLocation = (location: { search: string }) => queryFromStri export const stringifyQuery = (query: object) => qs.stringify(query, { addQueryPrefix: true, encode: false }); export const getMatch = memoize(1000)((current: string, target: string, startsWith: boolean = true) => { - const startsWithTarget = startsWith && current.startsWith(target); + const startsWithTarget = current && startsWith && current.startsWith(target); const currentIsTarget = typeof target === 'string' && current === target; - const matchTarget = target && current.match(target); + const matchTarget = current && target && current.match(target); if (startsWithTarget || currentIsTarget || matchTarget) { return { path: current };