Skip to content

Commit dcff56a

Browse files
committed
Bump dev dependencies and fix new lint issues
1 parent 3c13c33 commit dcff56a

File tree

90 files changed

+1096
-1110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1096
-1110
lines changed

lib/assert.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,9 @@ function wrapAssertions(callbacks) {
344344

345345
if (isPromise(thrower)) {
346346
return handlePromise(thrower, false);
347-
} else if (isObservable(thrower)) {
347+
}
348+
349+
if (isObservable(thrower)) {
348350
return handleObservable(thrower, false);
349351
}
350352

@@ -361,14 +363,18 @@ function wrapAssertions(callbacks) {
361363
if (!threw) {
362364
if (isPromise(retval)) {
363365
return handlePromise(retval, true);
364-
} else if (isObservable(retval)) {
366+
}
367+
368+
if (isObservable(retval)) {
365369
return handleObservable(retval, true);
366370
}
371+
367372
fail(this, new AssertionError({
368373
assertion: 'throws',
369374
message,
370375
values: [formatWithLabel('Function returned:', retval)]
371376
}));
377+
372378
return;
373379
}
374380

@@ -426,7 +432,9 @@ function wrapAssertions(callbacks) {
426432

427433
if (isPromise(nonThrower)) {
428434
return handlePromise(nonThrower, false);
429-
} else if (isObservable(nonThrower)) {
435+
}
436+
437+
if (isObservable(nonThrower)) {
430438
return handleObservable(nonThrower, false);
431439
}
432440

@@ -444,9 +452,12 @@ function wrapAssertions(callbacks) {
444452

445453
if (isPromise(retval)) {
446454
return handlePromise(retval, true);
447-
} else if (isObservable(retval)) {
455+
}
456+
457+
if (isObservable(retval)) {
448458
return handleObservable(retval, true);
449459
}
460+
450461
pass(this);
451462
},
452463

lib/process-adapter.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ exports.installPrecompilerHook = () => {
101101
});
102102
};
103103

104+
/* eslint-disable node/no-deprecated-api */
104105
exports.installDependencyTracking = (dependencies, testPath) => {
105106
Object.keys(require.extensions).forEach(ext => {
106107
const wrappedHandler = require.extensions[ext];
@@ -114,3 +115,4 @@ exports.installDependencyTracking = (dependencies, testPath) => {
114115
};
115116
});
116117
};
118+
/* eslint-enable node/no-deprecated-api */

0 commit comments

Comments
 (0)