cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: upgrade jasmine (and related typings) to latest version (#19904)

Browse Source 
With these changes, the types are a little stricter now and also not
compatible with Protractor's jasmine-like syntax. So, we have to also
use `@types/jasminewd2` for e2e tests (but not for non-e2e tests).

I also had to "augment" `@types/jasminewd2`, because the latest
typings from [DefinitelyTyped][1] do not reflect the fact that the
`jasminewd2` version (v2.1.0) currently used by Protractor supports
passing a `done` callback to a spec.

[1]: 566e039485/types/jasminewd2/index.d.ts (L9-L15)

Fixes #23952
Closes #24733

PR Close #19904
This commit is contained in:
George Kalpakas
2017-10-24 14:54:08 +03:00
committed by Miško Hevery
parent 1e74ea9e60
commit 00c110b055
59 changed files with 332 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/router/src/url_tree.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import {PRIMARY_OUTLET, ParamMap, convertToParamMap} from './shared';
import {PRIMARY_OUTLET, ParamMap, Params, convertToParamMap} from './shared';
import {forEach, shallowEqual} from './utils/collection';
export function createEmptyUrlTree() {
@ -23,8 +23,8 @@ export function containsTree(container: UrlTree, containee: UrlTree, exact: bool
containsSegmentGroup(container.root, containee.root);
}
function equalQueryParams(
container: {[k: string]: string}, containee: {[k: string]: string}): boolean {
function equalQueryParams(container: Params, containee: Params): boolean {
// TODO: This does not handle array params correctly.
return shallowEqual(container, containee);
}
@ -38,8 +38,8 @@ function equalSegmentGroups(container: UrlSegmentGroup, containee: UrlSegmentGro
return true;
}
function containsQueryParams(
container: {[k: string]: string}, containee: {[k: string]: string}): boolean {
function containsQueryParams(container: Params, containee: Params): boolean {
// TODO: This does not handle array params correctly.
return Object.keys(containee).length <= Object.keys(container).length &&
Object.keys(containee).every(key => containee[key] === container[key]);
}
@ -112,7 +112,7 @@ export class UrlTree {
/** The root segment group of the URL tree */
public root: UrlSegmentGroup,
/** The query params of the URL */
public queryParams: {[key: string]: string},
public queryParams: Params,
/** The fragment of the URL */
public fragment: string|null) {}
@ -446,8 +446,8 @@ class UrlParser {
return new UrlSegmentGroup([], this.parseChildren());
}
parseQueryParams(): {[key: string]: any} {
const params: {[key: string]: any} = {};
parseQueryParams(): Params {
const params: Params = {};
if (this.consumeOptional('?')) {
do {
this.parseQueryParam(params);
@ -534,7 +534,7 @@ class UrlParser {
}
// Parse a single query parameter `name[=value]`
private parseQueryParam(params: {[key: string]: any}): void {
private parseQueryParam(params: Params): void {
const key = matchQueryParams(this.remaining);
if (!key) {
return;