Skip to content

Commit

Permalink
fix(@angular/cli): bump jasmine and add jasminewd2 types
Browse files Browse the repository at this point in the history
This bumps jasmine types to 2.5.53.
The version was previously pinned down to 2.5.45, because more recent versions weren't playing nice with Protractor
and lead to errors like angular/protractor#4176

The proper fix appears to be the one mentioned in the Protractor issue: add `@types/jasminewd2` typings,
and add these typings to the tsconfig for e2e tests.

[jasminewd](https://github.com/angular/jasminewd) is the adapter used by Protractor to handle the async part.
  • Loading branch information
cexbrayat authored and danielronnkvist committed Jun 28, 2017
1 parent 7b677bf commit b67b759
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
Expand Down
3 changes: 2 additions & 1 deletion packages/@angular/cli/blueprints/ng/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"@angular/cli": "<%= version %>",
"@angular/compiler-cli": "^4.0.0",
"@angular/language-service": "^4.0.0",<% if (!minimal) { %>
"@types/jasmine": "2.5.45",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
"codelyzer": "~3.0.1",
"jasmine-core": "~2.6.2",
Expand Down

0 comments on commit b67b759

Please sign in to comment.