Merge pull request #993 from meeber/refactor-expect-types

keithamus · web-flow · commit 9116bc85910d · 2017-06-19T10:48:23.000+01:00
refactor: `expectTypes` to access `ssfi` flag
diff --git a/lib/chai/core/assertions.js b/lib/chai/core/assertions.js
@@ -462,7 +462,7 @@ module.exports = function (chai, _) {
   function include (val, msg) {
     if (msg) flag(this, 'message', msg);
 
-    _.expectTypes(this, ['array', 'object', 'string'], flag(this, 'ssfi'));
+    _.expectTypes(this, ['array', 'object', 'string']);
 
     var obj = flag(this, 'object')
       , objType = _.type(obj).toLowerCase()
diff --git a/lib/chai/utils/expectTypes.js b/lib/chai/utils/expectTypes.js
@@ -13,8 +13,6 @@
  *
  * @param {Mixed} obj constructed Assertion
  * @param {Array} type A list of allowed types for this assertion
- * @param {Function} ssfi starting point for removing implementation frames from
- *                        stack trace of AssertionError
  * @namespace Utils
  * @name expectTypes
  * @api public
@@ -24,8 +22,9 @@ var AssertionError = require('assertion-error');
 var flag = require('./flag');
 var type = require('type-detect');
 
-module.exports = function expectTypes(obj, types, ssfi) {
+module.exports = function expectTypes(obj, types) {
   var flagMsg = flag(obj, 'message');
+  var ssfi = flag(obj, 'ssfi');
 
   flagMsg = flagMsg ? flagMsg + ': ' : '';
 
