[Pkg-javascript-commits] [node-mocha] 04/12: Merge tag 'upstream/1.21.5'

[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 5377a0c837240aad7ba8a83204b8ac3e7f37fe6e
Merge: 2fc87e9 ef62083
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Sun Oct 12 16:46:25 2014 +0200

    Merge tag 'upstream/1.21.5'
    
    Upstream version 1.21.5
    
    # gpg: Signature made dom 12 ott 2014 16:46:23 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                           |   3 +-
 History.md                            |  23 ++++
 Makefile                              |  21 ++-
 bin/_mocha                            |  45 +-----
 bower.json                            |   2 +-
 component.json                        |   2 +-
 lib/browser/escape-string-regexp.js   |  11 ++
 lib/browser/glob.js                   |   0
 lib/interfaces/bdd.js                 |   7 +-
 lib/interfaces/exports.js             |   2 +-
 lib/interfaces/qunit.js               |   3 +-
 lib/interfaces/tdd.js                 |   7 +-
 lib/mocha.js                          |  13 +-
 lib/ms.js                             |   2 +-
 lib/reporters/base.js                 |   2 +-
 lib/reporters/json-cov.js             |   2 +-
 lib/reporters/json.js                 |   8 +-
 lib/reporters/nyan.js                 |   2 +-
 lib/reporters/templates/coverage.jade |   3 +-
 lib/runnable.js                       |   1 +
 lib/runner.js                         |  21 ++-
 lib/suite.js                          |   3 +-
 lib/utils.js                          | 116 ++++++++++------
 mocha.js                              | 252 ++++++++++++++++++++++++----------
 package.json                          |  17 +--
 support/compile.js                    |  14 +-
 support/tail.js                       |   3 +-
 test/acceptance/timeout.js            |  49 ++++++-
 test/acceptance/utils.js              |  31 +++++
 test/regression/issue1327/case.js     |  14 ++
 test/regression/issue1327/control.js  |  10 ++
 test/reporters/base.js                |  68 +++++++++
 test/reporters/json.js                |  19 +++
 test/runnable.js                      |  14 ++
 34 files changed, 594 insertions(+), 196 deletions(-)

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