chai 1.7.2 → 1.9.1

package/lib/chai/utils/addChainableMethod.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - addChainingMethod utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 
@@ -9,6 +9,8 @@
  */
 
 var transferFlags = require('./transferFlags');
+var flag = require('./flag');
+var config = require('../config');
 
 /*!
  * Module variables
@@ -55,15 +57,30 @@ var call  = Function.prototype.call,
  */
 
 module.exports = function (ctx, name, method, chainingBehavior) {
-  if (typeof chainingBehavior !== 'function')
+  if (typeof chainingBehavior !== 'function') {
     chainingBehavior = function () { };
+  }
+
+  var chainableBehavior = {
+      method: method
+    , chainingBehavior: chainingBehavior
+  };
+
+  // save the methods so we can overwrite them later, if we need to.
+  if (!ctx.__methods) {
+    ctx.__methods = {};
+  }
+  ctx.__methods[name] = chainableBehavior;
 
   Object.defineProperty(ctx, name,
     { get: function () {
-        chainingBehavior.call(this);
+        chainableBehavior.chainingBehavior.call(this);
 
-        var assert = function () {
-          var result = method.apply(this, arguments);
+        var assert = function assert() {
+          var old_ssfi = flag(this, 'ssfi');
+          if (old_ssfi && config.includeStack === false)
+            flag(this, 'ssfi', assert);
+          var result = chainableBehavior.method.apply(this, arguments);
           return result === undefined ? this : result;
         };
 

package/lib/chai/utils/addMethod.js

@@ -1,9 +1,11 @@
 /*!
  * Chai - addMethod utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 
+var config = require('../config');
+
 /**
  * ### .addMethod (ctx, name, method)
  *
@@ -28,9 +30,13 @@
  * @name addMethod
  * @api public
  */
+var flag = require('./flag');
 
 module.exports = function (ctx, name, method) {
   ctx[name] = function () {
+    var old_ssfi = flag(this, 'ssfi');
+    if (old_ssfi && config.includeStack === false)
+      flag(this, 'ssfi', ctx[name]);
     var result = method.apply(this, arguments);
     return result === undefined ? this : result;
   };

package/lib/chai/utils/addProperty.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - addProperty utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/flag.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - flag utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/getActual.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - getActual utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 
@@ -14,6 +14,5 @@
  */
 
 module.exports = function (obj, args) {
-  var actual = args[4];
-  return 'undefined' !== typeof actual ? actual : obj._obj;
+  return args.length > 4 ? args[4] : obj._obj;
 };

package/lib/chai/utils/getEnumerableProperties.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - getEnumerableProperties utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/getMessage.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - message composition utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/getName.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - getName utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/getPathValue.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - getPathValue utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * @see https://github.com/logicalparadox/filtr
  * MIT Licensed
  */

package/lib/chai/utils/getProperties.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - getProperties utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/index.js

@@ -62,7 +62,7 @@ exports.transferFlags = require('./transferFlags');
  * Deep equal utility
  */
 
-exports.eql = require('./eql');
+exports.eql = require('deep-eql');
 
 /*!
  * Deep path value
@@ -106,3 +106,9 @@ exports.overwriteMethod = require('./overwriteMethod');
 
 exports.addChainableMethod = require('./addChainableMethod');
 
+/*!
+ * Overwrite chainable method
+ */
+
+exports.overwriteChainableMethod = require('./overwriteChainableMethod');
+

package/lib/chai/utils/objDisplay.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - flag utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 
@@ -9,6 +9,7 @@
  */
 
 var inspect = require('./inspect');
+var config = require('../config');
 
 /**
  * ### .objDisplay (object)
@@ -26,7 +27,7 @@ module.exports = function (obj) {
   var str = inspect(obj)
     , type = Object.prototype.toString.call(obj);
 
-  if (str.length >= 40) {
+  if (config.truncateThreshold && str.length >= config.truncateThreshold) {
     if (type === '[object Function]') {
       return !obj.name || obj.name === ''
         ? '[Function]'

package/lib/chai/utils/overwriteChainableMethod.js

@@ -0,0 +1,53 @@
+/*!
+ * Chai - overwriteChainableMethod utility
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
+ * MIT Licensed
+ */
+
+/**
+ * ### overwriteChainableMethod (ctx, name, fn)
+ *
+ * Overwites an already existing chainable method
+ * and provides access to the previous function or
+ * property.  Must return functions to be used for
+ * name.
+ *
+ *     utils.overwriteChainableMethod(chai.Assertion.prototype, 'length',
+ *       function (_super) {
+ *       }
+ *     , function (_super) {
+ *       }
+ *     );
+ *
+ * Can also be accessed directly from `chai.Assertion`.
+ *
+ *     chai.Assertion.overwriteChainableMethod('foo', fn, fn);
+ *
+ * Then can be used as any other assertion.
+ *
+ *     expect(myFoo).to.have.length(3);
+ *     expect(myFoo).to.have.length.above(3);
+ *
+ * @param {Object} ctx object whose method / property is to be overwritten
+ * @param {String} name of method / property to overwrite
+ * @param {Function} method function that returns a function to be used for name
+ * @param {Function} chainingBehavior function that returns a function to be used for property
+ * @name overwriteChainableMethod
+ * @api public
+ */
+
+module.exports = function (ctx, name, method, chainingBehavior) {
+  var chainableBehavior = ctx.__methods[name];
+
+  var _chainingBehavior = chainableBehavior.chainingBehavior;
+  chainableBehavior.chainingBehavior = function () {
+    var result = chainingBehavior(_chainingBehavior).call(this);
+    return result === undefined ? this : result;
+  };
+
+  var _method = chainableBehavior.method;
+  chainableBehavior.method = function () {
+    var result = method(_method).apply(this, arguments);
+    return result === undefined ? this : result;
+  };
+};

package/lib/chai/utils/overwriteMethod.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - overwriteMethod utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/overwriteProperty.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - overwriteProperty utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/test.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - test utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/transferFlags.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - transferFlags utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai/utils/type.js

@@ -1,6 +1,6 @@
 /*!
  * Chai - type utility
- * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2012-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 

package/lib/chai.js

@@ -1,6 +1,6 @@
 /*!
  * chai
- * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+ * Copyright(c) 2011-2014 Jake Luer <jake@alogicalparadox.com>
  * MIT Licensed
  */
 
@@ -11,7 +11,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '1.7.2';
+exports.version = '1.9.1';
 
 /*!
  * Assertion Error
@@ -44,6 +44,13 @@ exports.use = function (fn) {
   return this;
 };
 
+/*!
+ * Configuration
+ */
+
+var config = require('./chai/config');
+exports.config = config;
+
 /*!
  * Primary `Assertion` prototype
  */

package/package.json

@@ -11,7 +11,7 @@
     "Veselin Todorov <hi@vesln.com>",
     "John Firebaugh <john.firebaugh@gmail.com>"
   ],
-  "version": "1.7.2",
+  "version": "1.9.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/chaijs/chai"
@@ -28,15 +28,15 @@
   },
   "dependencies": {
       "assertion-error": "1.0.0"
+    , "deep-eql": "0.1.3"
   },
   "devDependencies": {
       "component": "*"
-    , "coveralls": "2.0.16"
-    , "mocha": "1.8.2"
-    , "mocha-cloud": "*"
-    , "mocha-lcov-reporter": "0.0.1"
-    , "mocha-phantomjs": "2.0.2"
-    , "connect": "2.7.x"
-    , "jscoverage": "0.3.7"
+    , "karma": "0.12.x"
+    , "karma-mocha": "*"
+    , "karma-sauce-launcher": "0.2.x"
+    , "karma-phantomjs-launcher": "0.1.1"
+    , "mocha": "1.17.x"
+    , "istanbul": "0.2.x"
   }
 }

package/sauce.browsers.js

@@ -0,0 +1,128 @@
+
+/*!
+ * Chrome
+ */
+
+exports['SL_Chrome'] = {
+    base: 'SauceLabs'
+  , browserName: 'chrome'
+};
+
+/*!
+ * Firefox
+ */
+
+/*!
+ * TODO: Karma doesn't seem to like this, though sauce boots its up
+ *
+
+exports['SL_Firefox_23'] = {
+    base: 'SauceLabs'
+  , browserName: 'firefox'
+  , platform: 'Windows XP'
+  , version: '23'
+};
+
+*/
+
+exports['SL_Firefox_22'] = {
+    base: 'SauceLabs'
+  , browserName: 'firefox'
+  , platform: 'Windows 7'
+  , version: '22'
+};
+
+/*!
+ * Opera
+ */
+
+exports['SL_Opera_12'] = {
+    base: 'SauceLabs'
+  , browserName: 'opera'
+  , platform: 'Windows 7'
+  , version: '12'
+};
+
+exports['SL_Opera_11'] = {
+    base: 'SauceLabs'
+  , browserName: 'opera'
+  , platform: 'Windows 7'
+  , version: '11'
+};
+
+/*!
+ * Internet Explorer
+ */
+
+exports['SL_IE_10'] = {
+    base: 'SauceLabs'
+  , browserName: 'internet explorer'
+  , platform: 'Windows 2012'
+  , version: '10'
+};
+
+/*!
+ * Safari
+ */
+
+exports['SL_Safari_6'] = {
+    base: 'SauceLabs'
+  , browserName: 'safari'
+  , platform: 'Mac 10.8'
+  , version: '6'
+};
+
+exports['SL_Safari_5'] = {
+    base: 'SauceLabs'
+  , browserName: 'safari'
+  , platform: 'Mac 10.6'
+  , version: '5'
+};
+
+/*!
+ * iPhone
+ */
+
+/*!
+ * TODO: These take forever to boot or shut down. Causes timeout.
+ *
+
+exports['SL_iPhone_6'] = {
+    base: 'SauceLabs'
+  , browserName: 'iphone'
+  , platform: 'Mac 10.8'
+  , version: '6'
+};
+
+exports['SL_iPhone_5-1'] = {
+    base: 'SauceLabs'
+  , browserName: 'iphone'
+  , platform: 'Mac 10.8'
+  , version: '5.1'
+};
+
+exports['SL_iPhone_5'] = {
+    base: 'SauceLabs'
+  , browserName: 'iphone'
+  , platform: 'Mac 10.6'
+  , version: '5'
+};
+
+*/
+
+/*!
+ * Android
+ */
+
+/*!
+ * TODO: fails because of error serialization
+ *
+
+exports['SL_Android_4'] = {
+    base: 'SauceLabs'
+  , browserName: 'android'
+  , platform: 'Linux'
+  , version: '4'
+};
+
+*/

package/lib/chai/utils/eql.js

@@ -1,129 +0,0 @@
-// This is (almost) directly from Node.js assert
-// https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/assert.js
-
-module.exports = _deepEqual;
-
-var getEnumerableProperties = require('./getEnumerableProperties');
-
-// for the browser
-var Buffer;
-try {
-  Buffer = require('buffer').Buffer;
-} catch (ex) {
-  Buffer = {
-    isBuffer: function () { return false; }
-  };
-}
-
-function _deepEqual(actual, expected, memos) {
-
-  // 7.1. All identical values are equivalent, as determined by ===.
-  if (actual === expected) {
-    return true;
-
-  } else if (Buffer.isBuffer(actual) && Buffer.isBuffer(expected)) {
-    if (actual.length != expected.length) return false;
-
-    for (var i = 0; i < actual.length; i++) {
-      if (actual[i] !== expected[i]) return false;
-    }
-
-    return true;
-
-  // 7.2. If the expected value is a Date object, the actual value is
-  // equivalent if it is also a Date object that refers to the same time.
-  } else if (expected instanceof Date) {
-    if (!(actual instanceof Date)) return false;
-    return actual.getTime() === expected.getTime();
-
-  // 7.3. Other pairs that do not both pass typeof value == 'object',
-  // equivalence is determined by ==.
-  } else if (typeof actual != 'object' && typeof expected != 'object') {
-    return actual === expected;
-
-  } else if (expected instanceof RegExp) {
-    if (!(actual instanceof RegExp)) return false;
-    return actual.toString() === expected.toString();
-
-  // 7.4. For all other Object pairs, including Array objects, equivalence is
-  // determined by having the same number of owned properties (as verified
-  // with Object.prototype.hasOwnProperty.call), the same set of keys
-  // (although not necessarily the same order), equivalent values for every
-  // corresponding key, and an identical 'prototype' property. Note: this
-  // accounts for both named and indexed properties on Arrays.
-  } else {
-    return objEquiv(actual, expected, memos);
-  }
-}
-
-function isUndefinedOrNull(value) {
-  return value === null || value === undefined;
-}
-
-function isArguments(object) {
-  return Object.prototype.toString.call(object) == '[object Arguments]';
-}
-
-function objEquiv(a, b, memos) {
-  if (isUndefinedOrNull(a) || isUndefinedOrNull(b))
-    return false;
-
-  // an identical 'prototype' property.
-  if (a.prototype !== b.prototype) return false;
-
-  // check if we have already compared a and b
-  var i;
-  if (memos) {
-    for(i = 0; i < memos.length; i++) {
-      if ((memos[i][0] === a && memos[i][1] === b) ||
-          (memos[i][0] === b && memos[i][1] === a))
-        return true;
-    }
-  } else {
-    memos = [];
-  }
-
-  //~~~I've managed to break Object.keys through screwy arguments passing.
-  //   Converting to array solves the problem.
-  if (isArguments(a)) {
-    if (!isArguments(b)) {
-      return false;
-    }
-    a = pSlice.call(a);
-    b = pSlice.call(b);
-    return _deepEqual(a, b, memos);
-  }
-  try {
-    var ka = getEnumerableProperties(a),
-        kb = getEnumerableProperties(b),
-        key;
-  } catch (e) {//happens when one is a string literal and the other isn't
-    return false;
-  }
-
-  // having the same number of owned properties (keys incorporates
-  // hasOwnProperty)
-  if (ka.length != kb.length)
-    return false;
-
-  //the same set of keys (although not necessarily the same order),
-  ka.sort();
-  kb.sort();
-  //~~~cheap key test
-  for (i = ka.length - 1; i >= 0; i--) {
-    if (ka[i] != kb[i])
-      return false;
-  }
-
-  // remember objects we have compared to guard against circular references
-  memos.push([ a, b ]);
-
-  //equivalent values for every corresponding key, and
-  //~~~possibly expensive deep test
-  for (i = ka.length - 1; i >= 0; i--) {
-    key = ka[i];
-    if (!_deepEqual(a[key], b[key], memos)) return false;
-  }
-
-  return true;
-}