Merge 9da89f0 into 2a0c7bd

lib/scope.js

@@ -137,28 +137,20 @@ Scope.prototype.options = function _options(uri, requestBody, options) {
   return this.intercept(uri, 'OPTIONS', requestBody, options)
 }
 
+// Returns the list of keys for non-optional Interceptors that haven't been completed yet.
+// TODO: This assumes that completed mocks are removed from the keyedInterceptors list
+// (when persistence is off). We should change that (and this) in future.
 Scope.prototype.pendingMocks = function pendingMocks() {
-  const self = this
-
-  const pendingInterceptorKeys = Object.keys(this.keyedInterceptors).filter(
-    function(key) {
-      const interceptorList = self.keyedInterceptors[key]
-      const pendingInterceptors = interceptorList.filter(function(interceptor) {
-        // TODO: This assumes that completed mocks are removed from the keyedInterceptors list
-        // (when persistence is off). We should change that (and this) in future.
-        const persistedAndUsed =
-          self._persist && interceptor.interceptionCounter > 0
-        return !persistedAndUsed && !interceptor.optional
-      })
-      return pendingInterceptors.length > 0
-    }
+  return this.activeMocks().filter(key =>
+    this.keyedInterceptors[key].some(({ interceptionCounter, optional }) => {
+      const persistedAndUsed = this._persist && interceptionCounter > 0
+      return !persistedAndUsed && !optional
+    })
   )
-
-  return pendingInterceptorKeys
 }
 
 // Returns all keyedInterceptors that are active.
-// This incomplete interceptors, persisted but complete interceptors, and
+// This includes incomplete interceptors, persisted but complete interceptors, and
 // optional interceptors, but not non-persisted and completed interceptors.
 Scope.prototype.activeMocks = function activeMocks() {
   return Object.keys(this.keyedInterceptors)