Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
chore(*): update protractor to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
petebacondarwin committed May 20, 2020
1 parent ed97395 commit 1ce0aa8
Show file tree
Hide file tree
Showing 3 changed files with 331 additions and 192 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"npm-run": "^4.1.0",
"open-sans-fontface": "^1.4.0",
"promises-aplus-tests": "~2.1.0",
"protractor": "^5.4.1",
"protractor": "^7.0.0",
"q": "~1.0.0",
"q-io": "^1.10.9",
"qq": "^0.3.5",
Expand All @@ -103,7 +103,7 @@
"//1": "`natives@1.1.0` does not work with Node.js 10.x on Windows 10",
"//2": "(E.g. see https://github.com/gulpjs/gulp/issues/2162 and https://github.com/nodejs/node/issues/25132.)",
"natives": "1.1.6",
"//2": "`graceful-fs` needs to be pinned to support gulp 3",
"//3": "`graceful-fs` needs to be pinned to support gulp 3",
"graceful-fs": "^4.2.3"
},
"commitplease": {
Expand All @@ -115,4 +115,4 @@
"path": "node_modules/cz-conventional-changelog"
}
}
}
}
6 changes: 2 additions & 4 deletions test/e2e/tests/ng-route-promise.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ describe('ngRoute promises', function() {
expect(element.all(by.tagName('li')).count()).toBe(5);
});

it('should time out if the promise takes long enough', function() {
it('should time out if the promise takes long enough', function(done) {
// Don't try this at home kids, I'm a protractor dev
browser.manage().timeouts().setScriptTimeout(1000);
browser.waitForAngular().then(function() {
fail('waitForAngular() should have timed out, but didn\'t');
}, function(error) {
expect(error.message).toContain('Timed out waiting for asynchronous Angular tasks to finish');
});
}, done);
});

it('should wait for route promises when navigating to another route', function() {
Expand Down
Loading

0 comments on commit 1ce0aa8

Please sign in to comment.