chai 2.2.0 → 3.2.0

package/CONTRIBUTING.md

@@ -140,26 +140,30 @@ git push origin <topic-branch-name>
 <a name="releasing"></a>
 ## Releasing
 
-Releases can be prepared by any core-contributor or user whom has push access to
-the `chaijs/chai` repository.
-
-This process requires [git-extras](https://github.com/tj/git-extras) for some steps.
-
-1. Ensure all tests pass.
-2. Bump the version tag in-code and for all package managers.
-  - `lib/chai.js`
-  - `package.json`
-  - `component.json`
-  - `bower.json`
-3. Build the browser version with `make`.
-4. Append commit log to `HISTORY.md` using `git changelog` command.
-5. Write human-friendly `ReleaseNotes.md` based on changelog.
+Releases can be **prepared** by anyone with access to the code.
+
+Simply run `make release-major`, `make release-minor`, or `make-release-patch`
+and it will automatically do the following:
+
+ - Build chai.js
+ - Bump the version numbers accross the project
+ - Make a commit within git
+
+All you need to do is push the commit up and make a pull request, one of the core contributors will merge it and publish a release.
+
+### Publishing a Release
+
+Anyone who is a core contributor (see the [Core Contributors Heading in the Readme](https://github.com/chaijs/chai#core-contributors)) can publish a release:
+
+1. Go to te [Releases page on Github](https://github.com/chaijs/chai/releases)
+2. Hit "Draft a new release" (if you can't see this, you're not a core contributor!)
+3. Write human-friendly Release Notes based on changelog.
+  - The release title is "x.x.x / YYYY-MM-DD" (where x.x.x is the version number)
   - If breaking changes, write migration tutorial(s) and reasoning.
   - Callouts for community contributions (PRs) with links to PR and contributing user.
   - Callouts for other fixes made by core contributors with links to issue.
-6. Update `README.md` with an updated contributors list using `git summary` command.
-7. Push a tagged release using `git release x.x.x`.
-  - All tagged releases are published to NPM.
+4. Hit "Save Draft" and get other core contributors to check your work, or alternatively hit "Publish release"
+5. That's it!
 
 <a name="support"></a>
 ## Support

package/History.md

@@ -1,3 +1,24 @@
+### Note
+
+As of 3.0.0, the History.md file has been deprecated. [Please refer to the full
+commit logs available on GitHub](https://github.com/chaijs/chai/commits/master).
+
+---
+
+2.3.0 / 2015-04-26
+==================
+
+  * Merge pull request #423 from ehntoo/patch-1
+  * Merge pull request #422 from ljharb/fix_descriptor_tests
+  * Fix a small bug in the .null assertion docs
+  * Use a regex to account for property ordering issues across engines.
+  * Add `make test-firefox`
+  * Merge pull request #417 from astorije/astorije/minimalist-typo
+  * Remove trailing whitespaces
+  * Fix super minor typo in an example
+  * Merge pull request #408 from ljharb/enumerableProperty
+  * Add `ownPropertyDescriptor` assertion.
+
 2.2.0 / 2015-03-26
 ==================
 

package/README.md

@@ -1,14 +1,21 @@
 [![Chai Documentation](http://chaijs.com/public/img/chai-logo.png)](http://chaijs.com)
 
+[![license:mit](https://img.shields.io/badge/license-mit-green.svg?style=flat-square)](#license)<br>
+[![tag:?](https://img.shields.io/github/tag/chaijs/chai.svg?style=flat-square)](https://github.com/chaijs/chai/releases)
+[![build:?](https://img.shields.io/travis/chaijs/chai/master.svg?style=flat-square)](https://travis-ci.org/chaijs/chai)
+[![coverage:?](https://img.shields.io/coveralls/chaijs/chai/master.svg?style=flat-square)](https://coveralls.io/r/chaijs/chai)<br>
+[![npm:](https://img.shields.io/npm/v/chai.svg?style=flat-square)](https://www.npmjs.com/packages/chai)
+[![dependencies:?](https://img.shields.io/npm/dm/chai.svg?style=flat-square)](https://www.npmjs.com/packages/chai)
+[![devDependencies:?](https://img.shields.io/david/chaijs/chai.svg?style=flat-square)](https://david-dm.org/chaijs/chai)
+
+[![Selenium Test Status](https://saucelabs.com/browser-matrix/chaijs.svg)](https://saucelabs.com/u/chaijs)
+
+
 Chai is a BDD / TDD assertion library for [node](http://nodejs.org) and the browser that
 can be delightfully paired with any javascript testing framework.
 
 For more information or to download plugins, view the [documentation](http://chaijs.com).
 
-[![Build Status](https://travis-ci.org/chaijs/chai.svg?branch=master)](https://travis-ci.org/chaijs/chai)
-
-[![Selenium Test Status](https://saucelabs.com/browser-matrix/chaijs.svg)](https://saucelabs.com/u/chaijs)
-
 ### Plugins
 
 Chai offers a robust Plugin architecture for extending Chai's assertions and interfaces.
@@ -21,86 +28,33 @@ Chai offers a robust Plugin architecture for extending Chai's assertions and int
 
 - [chaijs / assertion-error](https://github.com/chaijs/assertion-error): Custom `Error` constructor thrown upon an assertion failing.
 - [chaijs / deep-eql](https://github.com/chaijs/deep-eql): Improved deep equality testing for Node.js and the browser.
+- [chaijs / type-detect](https://github.com/chaijs/type-detect): Improved typeof detection for node.js and the browser.
+
+### Contributing
+
+Thank you very much for considering to contribute!
+
+Here are a few issues other contributors frequently ran into when opening pull requests:
+
+- Please do not commit changes to the `chai.js` build. We do it once per release.
+- Before pushing your commits, please make sure you [rebase](https://github.com/chaijs/chai/blob/master/CONTRIBUTING.md#pull-requests) them.
+
+We also strongly encourage you to read our detailed [contribution guidelines](https://github.com/chaijs/chai/blob/master/CONTRIBUTING.md).
 
 ### Contributors
 
-     project  : chai
-     repo age : 3 years, 3 months
-     active   : 232 days
-     commits  : 879
-     files    : 59
-     authors  :
-       555  Jake Luer           63.1%
-        79  Veselin Todorov     9.0%
-        43  Domenic Denicola    4.9%
-        41  Keith Cirkel        4.7%
-        14  Joshua Perry        1.6%
-         8  Chris Polis         0.9%
-         6  Ruben Verborgh      0.7%
-         6  Ian Zamojc          0.7%
-         5  leider              0.6%
-         5  George Kats         0.6%
-         5  Scott Nonnenberg    0.6%
-         5  Jo Liss             0.6%
-         5  Juliusz Gonera      0.6%
-         4  Veselin             0.5%
-         4  Nick Heiner         0.5%
-         4  David da Silva      0.5%
-         4  Chris Jones         0.5%
-         4  josher19            0.5%
-         4  John Firebaugh      0.5%
-         4  Max Edmands         0.5%
-         4  charlierudolph      0.5%
-         3  Ryunosuke SATO      0.3%
-         3  Jason Karns         0.3%
-         3  Jeff Barczewski     0.3%
-         3  Andrei Neculau      0.3%
-         3  Duncan Beevers      0.3%
-         3  Jake Rosoman        0.3%
-         2  Teddy Cross         0.2%
-         2  Bartvds             0.2%
-         2  Edwin Shao          0.2%
-         2  Gregg Lind          0.2%
-         2  Roman Masek         0.2%
-         2  Jérémie Astori      0.2%
-         2  Jakub Nešetřil      0.2%
-         2  eldritch fossicker  0.2%
-         1  Adam Hull           0.1%
-         1  toastynerd          0.1%
-         1  Anand Patil         0.1%
-         1  Benjamin Horsleben  0.1%
-         1  Brandon Payton      0.1%
-         1  Chasen Le Hara      0.1%
-         1  Chris Connelly      0.1%
-         1  Chris Thompson      0.1%
-         1  Christopher Hiller  0.1%
-         1  Chun-Yi             0.1%
-         1  DD                  0.1%
-         1  Danilo Vaz          0.1%
-         1  Dido Arellano       0.1%
-         1  Doug Neiner         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%
-         1  Martin Middel       0.1%
-         1  Mathias Schreck     0.1%
-         1  Michael Lange       0.1%
-         1  Niklas Närhinen     0.1%
-         1  Paul Miller         0.1%
-         1  Refael Ackermann    0.1%
-         1  Sasha Koss          0.1%
-         1  Victor Costan       0.1%
-         1  Vinay Pulim         0.1%
-         1  Virginie BARDALES   0.1%
-         1  Vlad GURDIGA        0.1%
-         1  ericdouglas         0.1%
-         1  laconbass           0.1%
-         1  mohayonao           0.1%
-         1  piecioshka          0.1%
-         1  root                0.1%
-         1  shinnn              0.1%
+Please see the full
+[Contributors Graph](https://github.com/chaijs/chai/graphs/contributors) for our
+list of contributors.
+
+### Core Contributors
+
+Feel free to reach out to any of the core-contributors with you questions or
+concerns. We will do our best to respond in a timely manner.
+
+[![Jake Luer](https://avatars3.githubusercontent.com/u/58988?v=3&s=50)](https://github.com/logicalparadox)
+[![Veselin Todorov](https://avatars3.githubusercontent.com/u/330048?v=3&s=50)](https://github.com/vesln)
+[![Keith Cirkel](https://avatars3.githubusercontent.com/u/118266?v=3&s=50)](https://github.com/keithamus)
 
 ## License
 

package/ReleaseNotes.md

@@ -1,5 +1,43 @@
 # Release Notes
 
+## Note
+
+As of 3.0.0, the ReleaseNotes.md file has been deprecated. [Please refer to the release notes available on Github](https://github.com/chaijs/chai/releases). Or
+[the release notes on the chaijs.com website](https://chaijs.com/releases).
+
+---
+
+## 2.3.0 / 2015-04-26
+
+Added `ownPropertyDescriptor` assertion:
+
+```js
+expect('test').to.have.ownPropertyDescriptor('length');
+expect('test').to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 4 });
+expect('test').not.to.have.ownPropertyDescriptor('length', { enumerable: false, configurable: false, writable: false, value: 3 });
+expect('test').ownPropertyDescriptor('length').to.have.property('enumerable', false);
+expect('test').ownPropertyDescriptor('length').to.have.keys('value');
+```
+
+### Community Contributions
+
+#### Code Features & Fixes
+
+ * [#408](https://github.com/chaijs/chai/pull/408) Add `ownPropertyDescriptor`
+   assertion.
+   By [@ljharb](https://github.com/ljharb)
+ * [#422](https://github.com/chaijs/chai/pull/422) Improve ownPropertyDescriptor
+   tests.
+   By [@ljharb](https://github.com/ljharb)
+
+#### Documentation fixes
+
+ * [#417](https://github.com/chaijs/chai/pull/417) Fix documentation typo
+ By [@astorije](https://github.com/astorije)
+ * [#423](https://github.com/chaijs/chai/pull/423) Fix inconsistency in docs.
+ By [@ehntoo](https://github.com/ehntoo)
+
+
 ## 2.2.0 / 2015-03-26
 
 Deep property strings can now be escaped using `\\` - for example:

package/bower.json

@@ -1,6 +1,5 @@
 {
   "name": "chai",
-  "version": "2.2.0",
   "description": "BDD/TDD assertion library for node.js and the browser. Test framework agnostic.",
   "license": "MIT",
   "keywords": [