honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests(e2e): upgrade Protractor to 1.7.0 and remove special cases for shadow dom 

With Protractor 1.7.0, which installs chromedriver 2.14, shadow DOM is supported.
This commit is contained in:
Julie Ralph 2015-02-17 13:19:19 -08:00
parent cd90038950
commit 5af0ac258b
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -9,7 +9,7 @@ env:
- LOGS_DIR=/tmp/angular-build/logs - LOGS_DIR=/tmp/angular-build/logs
- ARCH=linux-x64 - ARCH=linux-x64
matrix: matrix:
- MODE=js DART_CHANNEL=stable - MODE=js DART_CHANNEL=dev
# Dissabled until Dart v1.9 hits stable # Dissabled until Dart v1.9 hits stable
# - MODE=dart DART_CHANNEL=stable # - MODE=dart DART_CHANNEL=stable
- MODE=dart DART_CHANNEL=dev - MODE=dart DART_CHANNEL=dev

6
modules/benchmarks/e2e_test/naive_infinite_scroll_perf.es6
View File

@ -13,10 +13,8 @@ describe('ng2 naive infinite scroll benchmark', function () {
url: URL, url: URL,
id: 'ng2.naive_infinite_scroll', id: 'ng2.naive_infinite_scroll',
work: function() { work: function() {
browser.executeScript( element(by.deepCss('#reset-btn')).click();
'document.querySelector("scroll-app /deep/ #reset-btn").click()'); element(by.deepCss('#run-btn')).click();
browser.executeScript(
'document.querySelector("scroll-app /deep/ #run-btn").click()');
browser.wait(() => { browser.wait(() => {
return $('#done').getText().then( return $('#done').getText().then(
function() { return true; }, function() { return true; },

6
modules/benchmarks_external/e2e_test/naive_infinite_scroll_perf.es6
View File

@ -13,10 +13,8 @@ describe('ng-dart1.x naive infinite scroll benchmark', function () {
url: URL, url: URL,
id: 'ng1-dart1.x.naive_infinite_scroll', id: 'ng1-dart1.x.naive_infinite_scroll',
work: function() { work: function() {
browser.executeScript( element(by.deepCss('#reset-btn')).click();
'document.querySelector("scroll-app /deep/ #reset-btn").click()'); element(by.deepCss('#run-btn')).click();
browser.executeScript(
'document.querySelector("scroll-app /deep/ #run-btn").click()');
var s = 1000; var s = 1000;
if (appSize > 4) { if (appSize > 4) {
s = s + appSize * 100; s = s + appSize * 100;

2
package.json
View File

@ -62,7 +62,7 @@
"merge": "^1.2.0", "merge": "^1.2.0",
"minimatch": "^2.0.1", "minimatch": "^2.0.1",
"minimist": "1.1.x", "minimist": "1.1.x",
"protractor": "1.6.x", "protractor": "1.7.x",
"q": "^1.0.1", "q": "^1.0.1",
"run-sequence": "^0.3.6", "run-sequence": "^0.3.6",
"source-map": "^0.3.0", "source-map": "^0.3.0",