[Pkg-javascript-commits] [node-mocha] 02/12: Merge tag 'upstream/1.21.4'

[Leo Iannacone]

This is an automated email from the git hooks/post-receive script.

l3on-guest pushed a commit to branch master
in repository node-mocha.

commit 2fc87e96817f7efff8690469599e6b8380e112fd
Merge: 1196d0b 739f5fe
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Sat Oct 11 18:50:59 2014 +0200

    Merge tag 'upstream/1.21.4'
    
    Upstream version 1.21.4
    
    # gpg: Signature made sab 11 ott 2014 18:50:56 CEST using RSA key ID D282FC25
    # gpg: Good signature from "Leo Iannacone <l3on at ubuntu.com>"
    # gpg:                 aka "Leo Iannacone <leo.iannacone at gmail.com>"
    # gpg:                 aka "Leo Iannacone <l3on at ubuntu-it.org>"
    # gpg:                 aka "Leonardo Iannacone <leonardo.iannacone at studio.unibo.it>"
    # gpg:                 aka "Leo Iannacone <info at leoiannacone.com>"
    # gpg:                 aka "Leonardo Iannacone <liannacone at arces.unibo.it>"

 .travis.yml                        |   5 +-
 History.md                         |  36 +++-
 Makefile                           |  19 ++-
 Readme.md                          | 337 ++++++++++++++++++++-----------------
 bin/_mocha                         |  61 ++++---
 bin/mocha                          |   5 +
 bower.json                         |   2 +-
 component.json                     |   2 +-
 lib/context.js                     |  15 ++
 lib/mocha.js                       |  32 +++-
 lib/reporters/base.js              |  52 +-----
 lib/reporters/doc.js               |   7 +
 lib/reporters/dot.js               |   5 +-
 lib/reporters/json.js              |  18 +-
 lib/reporters/progress.js          |  10 +-
 lib/reporters/xunit.js             |   3 +-
 lib/runnable.js                    |  40 ++++-
 lib/runner.js                      |   8 +-
 lib/suite.js                       |  23 +++
 lib/utils.js                       |  59 ++++++-
 mocha.js                           | 309 +++++++++++++++++++++++++---------
 package.json                       |  15 +-
 support/tail.js                    |  11 +-
 test/acceptance/context.js         |   6 +
 test/acceptance/diffs.js           |   7 +
 test/acceptance/failing/timeout.js |  17 ++
 test/acceptance/timeout.js         |  14 ++
 test/acceptance/utils.js           |  32 +++-
 test/reporters/json.js             |  43 +++++
 test/runnable.js                   |  67 ++++++++
 30 files changed, 916 insertions(+), 344 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-mocha.git