Skip to content

Commit 54ca79e

Browse files
committed
Improve time measurement in tests
Also use current Chromedriver
1 parent 4038951 commit 54ca79e

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

intern.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,17 @@
5757
},
5858

5959
"wd": {
60-
"environments": ["node", "chrome"]
60+
"environments": ["node", "chrome"],
61+
"tunnelOptions": {
62+
"drivers": [{ "name": "chrome", "version": "74.0.3729.6" }]
63+
}
64+
},
65+
66+
"firefox": {
67+
"environments": "firefox",
68+
"tunnelOptions": {
69+
"drivers": ["firefox"]
70+
}
6171
}
6272
},
6373

tests/functional/Element.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ registerSuite('Element', () => {
256256
);
257257
},
258258
() => {
259-
assert.closeTo(
260-
Date.now(),
261-
startTime + 2000,
262-
50,
259+
assert.operator(
260+
Date.now() - startTime,
261+
'>=',
262+
2000,
263263
'Driver should wait for implicit timeout before continuing'
264264
);
265265
return session.find('id', 'makeD');
@@ -273,9 +273,9 @@ registerSuite('Element', () => {
273273
})
274274
.then(child => {
275275
assert.operator(
276-
Date.now(),
276+
Date.now() - startTime,
277277
'<',
278-
startTime + 9000,
278+
9000,
279279
'Driver should not wait until end of implicit timeout once element is available'
280280
);
281281
assert.property(child, 'elementId');

tests/functional/Session.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,9 +1116,9 @@ registerSuite('Session', () => {
11161116
},
11171117
function() {
11181118
assert.operator(
1119-
Date.now(),
1119+
Date.now() - startTime,
11201120
'>=',
1121-
startTime + 2000,
1121+
2000,
11221122
'Driver should wait for implicit timeout before continuing'
11231123
);
11241124
}
@@ -1139,9 +1139,9 @@ registerSuite('Session', () => {
11391139
})
11401140
.then(function(element: Element) {
11411141
assert.operator(
1142-
Date.now(),
1142+
Date.now() - startTime,
11431143
'<',
1144-
startTime + 9000,
1144+
10000,
11451145
'Driver should not wait until end of implicit timeout once element is available'
11461146
);
11471147
assert.property(element, 'elementId');
@@ -1692,7 +1692,6 @@ registerSuite('Session', () => {
16921692
},
16931693

16941694
'#moveMouseTo'(this: Test) {
1695-
/*jshint maxlen:140 */
16961695
if (!session.capabilities.mouseEnabled) {
16971696
this.skip('mouse not enabled');
16981697
}

0 commit comments

Comments
 (0)