Merge pull request #456 from chaijs/3.x.x

3.x.x

lib/chai/core/assertions.js

@@ -136,6 +136,12 @@ module.exports = function (chai, _) {
    *     expect({ foo: 'bar' }).to.be.an('object');
    *     expect(null).to.be.a('null');
    *     expect(undefined).to.be.an('undefined');
+   *     expect(new Promise).to.be.a('promise');
+   *     expect(new Float32Array()).to.be.a('float32array');
+   *     expect(Symbol()).to.be.a('symbol');
+   *
+   *     // es6 overrides
+   *     expect({[Symbol.toStringTag]:()=>'foo'}).to.be.a('foo');
    *
    *     // language chain
    *     expect(foo).to.be.an.instanceof(Foo);
@@ -1269,7 +1275,7 @@ module.exports = function (chai, _) {
       }
 
       // next, check message
-      var message = 'object' === _.type(err) && "message" in err
+      var message = 'error' === _.type(err) && "message" in err
         ? err.message
         : '' + err;
 

lib/chai/interface/assert.js

@@ -1243,11 +1243,24 @@ module.exports = function (chai, util) {
   }
 
   /*!
-   * Undocumented / untested
+   * ### .ifError(object)
+   *
+   * Asserts if value is not a false value, and throws if it is a true value.
+   * This is added to allow for chai to be a drop-in replacement for Node's 
+   * assert class.
+   *
+   *     var err = new Error('I am a custom error');
+   *     assert.ifError(err); // Rethrows err!
+   *
+   * @name ifError
+   * @param {Object} object
+   * @api public
    */
 
-  assert.ifError = function (val, msg) {
-    new Assertion(val, msg).to.not.be.ok;
+  assert.ifError = function (val) {
+    if (val) {
+      throw(val);
+    }
   };
 
   /*!

lib/chai/utils/hasProperty.js

@@ -4,7 +4,7 @@
  * MIT Licensed
  */
 
-var type = require('./type');
+var type = require('type-detect');
 
 /**
  * ### .hasProperty(object, name)

lib/chai/utils/index.js

@@ -20,7 +20,7 @@ exports.test = require('./test');
  * type utility
  */
 
-exports.type = require('./type');
+exports.type = require('type-detect');
 
 /*!
  * message utility

package.json

@@ -34,7 +34,8 @@
   },
   "dependencies": {
     "assertion-error": "1.0.1",
-    "deep-eql": "0.1.3"
+    "deep-eql": "0.1.3",
+    "type-detect": "1.0.0"
   },
   "devDependencies": {
     "browserify": "10.2.1",

test/assert.js

@@ -558,8 +558,9 @@ describe('assert', function () {
     assert.ifError(undefined);
 
     err(function () {
-      assert.ifError('foo');
-     }, "expected \'foo\' to be falsy");
+      var err = new Error('This is an error message');
+      assert.ifError(err);
+     }, 'This is an error message');
   });
 
   it('operator', function() {