Merge pull request #375 from chaijs/release-2.1.0

Release v2.1.0
chaijs · Feb 23, 2015 · 09e17b9 · 09e17b9
2 parents 45f9e6a + ee5d666
commit 09e17b9
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 31 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,14 @@
+2.1.0 / 2015-02-23
+==================
+
+  * Merge pull request #374 from jmm/v2.0.1
+  * Increment version to 2.0.1.
+  * Merge pull request #365 from chaijs/fix-travis
+  * Fix travis.yml deploy
+  * Merge pull request #356 from Soviut/master
+  * documented fail methods for expect and should interfaces
+  * fail method added directly to expect
+
 2.0.0 / 2015-02-09
 ==================
 

diff --git a/README.md b/README.md
@@ -25,43 +25,44 @@ Chai offers a robust Plugin architecture for extending Chai's assertions and int
 ### Contributors
 
      project  : chai
-     repo age : 3 years, 2 months
-     active   : 220 days
-     commits  : 845
+     repo age : 3 years, 3 months
+     active   : 224 days
+     commits  : 859
      files    : 59
      authors  :
-       553  Jake Luer           65.4%
-        79  Veselin Todorov     9.3%
-        43  Domenic Denicola    5.1%
-        23  Keith Cirkel        2.7%
-        14  Joshua Perry        1.7%
+       554  Jake Luer           64.5%
+        79  Veselin Todorov     9.2%
+        43  Domenic Denicola    5.0%
+        29  Keith Cirkel        3.4%
+        14  Joshua Perry        1.6%
          8  Chris Polis         0.9%
+         6  Ian Zamojc          0.7%
          6  Ruben Verborgh      0.7%
-         5  Scott Nonnenberg    0.6%
-         5  George Kats         0.6%
          5  Juliusz Gonera      0.6%
-         5  leider              0.6%
+         5  George Kats         0.6%
          5  Jo Liss             0.6%
+         5  Scott Nonnenberg    0.6%
+         5  leider              0.6%
+         4  charlierudolph      0.5%
          4  Chris Jones         0.5%
+         4  Max Edmands         0.5%
          4  David da Silva      0.5%
-         4  Nick Heiner         0.5%
-         4  John Firebaugh      0.5%
          4  Veselin             0.5%
-         4  Max Edmands         0.5%
-         4  charlierudolph      0.5%
          4  josher19            0.5%
-         3  Jake Rosoman        0.4%
-         3  Jeff Barczewski     0.4%
-         3  Andrei Neculau      0.4%
-         3  Duncan Beevers      0.4%
-         3  Jason Karns         0.4%
-         3  Ryunosuke SATO      0.4%
-         2  Gregg Lind          0.2%
-         2  Teddy Cross         0.2%
-         2  Bartvds             0.2%
+         4  John Firebaugh      0.5%
+         4  Nick Heiner         0.5%
+         3  Andrei Neculau      0.3%
+         3  Duncan Beevers      0.3%
+         3  Ryunosuke SATO      0.3%
+         3  Jake Rosoman        0.3%
+         3  Jason Karns         0.3%
+         3  Jeff Barczewski     0.3%
          2  Jakub Nešetřil      0.2%
-         2  Edwin Shao          0.2%
+         2  Teddy Cross         0.2%
          2  Roman Masek         0.2%
+         2  Gregg Lind          0.2%
+         2  Edwin Shao          0.2%
+         2  Bartvds             0.2%
          1  toastynerd          0.1%
          1  Anand Patil         0.1%
          1  Benjamin Horsleben  0.1%
@@ -75,6 +76,7 @@ Chai offers a robust Plugin architecture for extending Chai's assertions and int
          1  Danilo Vaz          0.1%
          1  Dido Arellano       0.1%
          1  Jeff Welch          0.1%
+         1  Jesse McCarthy      0.1%
          1  Julien Wajsberg     0.1%
          1  Kilian Ciuffolo     0.1%
          1  Luís Cardoso        0.1%

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,20 @@
 # Release Notes
 
+## 2.1.0 / 2015-02-23
+
+Small release; fixes an issue where the Chai lib was incorrectly reporting the
+version number.
+
+Adds new `should.fail()` and `expect.fail()` methods, which are convinience
+methods to throw Assertion Errors.
+
+### Community Contributions
+
+#### Code Features & Fixes
+
+ * [#356](https://github.com/chaijs/chai/pull/356) Add should.fail(), expect.fail(). By [@Soviut](https://github.com/Soviut)
+ * [#374](https://github.com/chaijs/chai/pull/374) Increment version. By [@jmm](https://github.com/jmm)
+
 ## 2.0.0 / 2015-02-09
 
 Unfortunately with 1.10.0 - compatibility broke with older versions because of

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "chai",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "BDD/TDD assertion library for node.js and the browser. Test framework agnostic.",
   "license": "MIT",
   "keywords": [

diff --git a/chai.js b/chai.js
@@ -678,7 +678,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '1.10.0';
+exports.version = '2.1.0';
 
 /*!
  * Assertion Error
@@ -3739,8 +3739,29 @@ module.exports = function (chai, util) {
   chai.expect = function (val, message) {
     return new chai.Assertion(val, message);
   };
-};
 
+  /**
+   * ### .fail(actual, expected, [message], [operator])
+   *
+   * Throw a failure.
+   *
+   * @name fail
+   * @param {Mixed} actual
+   * @param {Mixed} expected
+   * @param {String} message
+   * @param {String} operator
+   * @api public
+   */
+
+  chai.expect.fail = function (actual, expected, message, operator) {
+    message = message || 'expect.fail()';
+    throw new chai.AssertionError(message, {
+        actual: actual
+      , expected: expected
+      , operator: operator
+    }, chai.expect.fail);
+  };
+};
 
 });
 
@@ -3787,6 +3808,28 @@ module.exports = function (chai, util) {
 
     var should = {};
 
+    /**
+     * ### .fail(actual, expected, [message], [operator])
+     *
+     * Throw a failure.
+     *
+     * @name fail
+     * @param {Mixed} actual
+     * @param {Mixed} expected
+     * @param {String} message
+     * @param {String} operator
+     * @api public
+     */
+
+    should.fail = function (actual, expected, message, operator) {
+      message = message || 'should.fail()';
+      throw new chai.AssertionError(message, {
+          actual: actual
+        , expected: expected
+        , operator: operator
+      }, should.fail);
+    };
+
     should.equal = function (val1, val2, msg) {
       new Assertion(val1, msg).to.equal(val2);
     };

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
     "name": "chai"
   , "repo": "chaijs/chai"
-  , "version": "2.0.1"
+  , "version": "2.1.0"
   , "description": "BDD/TDD assertion library for node.js and the browser. Test framework agnostic."
   , "license": "MIT"
   , "keywords": [

diff --git a/lib/chai.js b/lib/chai.js
@@ -11,7 +11,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '2.0.1';
+exports.version = '2.1.0';
 
 /*!
  * 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": "2.0.1",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/chaijs/chai"