[Pkg-javascript-commits] [node-mocks-http] 156/296: Merge branch 'release/1.3.0' into 1.x

[Thorsten Alteholz]

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

alteholz pushed a commit to branch master
in repository node-mocks-http.

commit 1c85031729348a04534455f9ab1ec6b4ce12f9dc
Merge: ee5bd61 ff3d654
Author: Johnny Estilles <johnny.estilles at agentia.asia>
Date:   Sun Apr 5 06:19:35 2015 +0800

    Merge branch 'release/1.3.0' into 1.x

 .eslintrc                          |  76 ++++++
 .jshintrc                          |  20 --
 .travis.yml                        |   9 +
 CODE_OF_CONDUCT.md                 |  13 +
 CODING_RULES.md                    | 182 +++++++++++++
 CONTRIBUTING.md                    | 172 ++++++++++++
 README.md                          |  53 ++--
 examples/express-route.js          |   2 +-
 examples/express-status-vs-json.js |   2 +-
 lib/http-mock.js                   |   6 +-
 lib/mockEventEmitter.js            |  20 +-
 lib/mockRequest.js                 |  43 ++-
 lib/mockResponse.js                | 102 +++++--
 lib/mockWritableStream.js          |   4 +-
 lib/node/_http_server.js           |  61 +++++
 lib/node/http.js                   |   5 +
 package.json                       |  58 ++--
 run-tests                          |  58 +---
 test/test-mockRequest.js           |  47 +++-
 test/test-mockResponse.js          | 539 ++++++++++++++++++++-----------------
 20 files changed, 1038 insertions(+), 434 deletions(-)

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