Merge pull request #548 from keithamus/release-3.4.1

chai@3.4.1
chaijs · Nov 7, 2015 · 5def52c · 5def52c
2 parents c977f90 + 86cc3e8
commit 5def52c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/chai.js b/chai.js
@@ -15,7 +15,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '3.4.0';
+exports.version = '3.4.1';
 
 /*!
  * Assertion Error
@@ -187,8 +187,8 @@ module.exports = function (_chai, util) {
    *
    * @name assert
    * @param {Philosophical} expression to be tested
-   * @param {String or Function} message or function that returns message to display if expression fails
-   * @param {String or Function} negatedMessage or function that returns negatedMessage to display if negated expression fails
+   * @param {String|Function} message or function that returns message to display if expression fails
+   * @param {String|Function} negatedMessage or function that returns negatedMessage to display if negated expression fails
    * @param {Mixed} expected value (remember to check for negation)
    * @param {Mixed} actual (optional) will default to `this.obj`
    * @param {Boolean} showDiff (optional) when set to `true`, assert will display a diff in addition to the message if expression fails
@@ -1400,7 +1400,7 @@ module.exports = function (chai, _) {
    *
    * @name keys
    * @alias key
-   * @param {String...|Array|Object} keys
+   * @param {...String|Array|Object} keys
    * @api public
    */
 
@@ -1503,7 +1503,6 @@ module.exports = function (chai, _) {
    *     expect(fn).to.not.throw('good function');
    *     expect(fn).to.throw(ReferenceError, /bad function/);
    *     expect(fn).to.throw(err);
-   *     expect(fn).to.not.throw(new RangeError('Out of range.'));
    *
    * Please note that when a throw expectation is negated, it will check each
    * parameter independently, starting with error constructor type. The appropriate way

diff --git a/lib/chai.js b/lib/chai.js
@@ -11,7 +11,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '3.4.0';
+exports.version = '3.4.1';
 
 /*!
  * Assertion Error

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "Veselin Todorov <hi@vesln.com>",
     "John Firebaugh <john.firebaugh@gmail.com>"
   ],
-  "version": "3.4.0",
+  "version": "3.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/chaijs/chai"