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

Fix benchpress for newest protractor and selenium (#11451)

Browse Source 
* chore: update protractor and selenium-webdriver packages

As `karma-jasmine` has a peer dependency on `jasmine-core@2.3`, but `jasmine` and `protractor` are using `jasmine-core@2.4` we need to add `jasmine-core@2.3` explicitly. Previously, the peer dependency was
satisfied by accident because npm deduped the dependency
for `jasmine-core@2.3` as top level dependency.

Note that the shrink-wrap files changes quite a bit because
of the deduping mechanism of npm.

* fix(benchpress): make it work with latest protractor and seleniuv-webdriver

* fix(e2e_tests): make them work with latest protractor
This commit is contained in:
Tobias Bosch
2016-09-09 10:37:47 -07:00
committed by Evan Martin
parent 71e9cae1d0
commit f386cb4ba9
11 changed files with 609 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/benchpress/src/runner.ts
View File

@ -63,7 +63,7 @@ export class Runner {
}
var inj = ReflectiveInjector.resolveAndCreate(sampleProviders);
var adapter = inj.get(WebDriverAdapter);
var adapter: WebDriverAdapter = inj.get(WebDriverAdapter);
return Promise
.all([adapter.capabilities(), adapter.executeScript('return window.navigator.userAgent;')])