Bump dev dependencies and fix new lint issues

avajs · Feb 14, 2018 · dcff56a · dcff56a
1 parent 3c13c33
commit dcff56a
Show file tree

Hide file tree

Showing 90 changed files with 1,096 additions and 1,110 deletions.
diff --git a/lib/assert.js b/lib/assert.js
@@ -344,7 +344,9 @@ function wrapAssertions(callbacks) {
 
 			if (isPromise(thrower)) {
 				return handlePromise(thrower, false);
-			} else if (isObservable(thrower)) {
+			}
+
+			if (isObservable(thrower)) {
 				return handleObservable(thrower, false);
 			}
 
@@ -361,14 +363,18 @@ function wrapAssertions(callbacks) {
 			if (!threw) {
 				if (isPromise(retval)) {
 					return handlePromise(retval, true);
-				} else if (isObservable(retval)) {
+				}
+
+				if (isObservable(retval)) {
 					return handleObservable(retval, true);
 				}
+
 				fail(this, new AssertionError({
 					assertion: 'throws',
 					message,
 					values: [formatWithLabel('Function returned:', retval)]
 				}));
+
 				return;
 			}
 
@@ -426,7 +432,9 @@ function wrapAssertions(callbacks) {
 
 			if (isPromise(nonThrower)) {
 				return handlePromise(nonThrower, false);
-			} else if (isObservable(nonThrower)) {
+			}
+
+			if (isObservable(nonThrower)) {
 				return handleObservable(nonThrower, false);
 			}
 
@@ -444,9 +452,12 @@ function wrapAssertions(callbacks) {
 
 			if (isPromise(retval)) {
 				return handlePromise(retval, true);
-			} else if (isObservable(retval)) {
+			}
+
+			if (isObservable(retval)) {
 				return handleObservable(retval, true);
 			}
+
 			pass(this);
 		},
 

diff --git a/lib/process-adapter.js b/lib/process-adapter.js
@@ -101,6 +101,7 @@ exports.installPrecompilerHook = () => {
 	});
 };
 
+/* eslint-disable node/no-deprecated-api */
 exports.installDependencyTracking = (dependencies, testPath) => {
 	Object.keys(require.extensions).forEach(ext => {
 		const wrappedHandler = require.extensions[ext];
@@ -114,3 +115,4 @@ exports.installDependencyTracking = (dependencies, testPath) => {
 		};
 	});
 };
+/* eslint-enable node/no-deprecated-api */