Merge branch 'hotfix/1.4.3' into 1.x

.eslintrc

@@ -1,76 +1,82 @@
-{
-    "env": {
-        "node": true
-    },
+env:
+  node: true
 
-    "rules": {
-        "comma-dangle": 2,
-        "no-alert": 2,
-        "no-array-constructor": 2,
-        "no-caller": 2,
-        "no-catch-shadow": 2,
-        "no-control-regex": 2,
-        "no-debugger": 2,
-        "no-div-regex": 2,
-        "no-dupe-keys": 2,
-        "no-else-return": 2,
-        "no-empty": 2,
-        "no-empty-class": 2,
-        "no-eq-null": 2,
-        "no-eval": 2,
-        "no-ex-assign": 2,
-        "no-func-assign": 0,
-        "no-floating-decimal": 2,
-        "no-implied-eval": 2,
-        "no-with": 2,
-        "no-fallthrough": 2,
-        "no-unreachable": 2,
-        "no-undef": 2,
-        "no-undef-init": 2,
-        "no-unused-expressions": 2,
-        "no-octal": 2,
-        "no-octal-escape": 2,
-        "no-obj-calls": 2,
-        "no-multi-str": 2,
-        "no-new-wrappers": 2,
-        "no-new": 2,
-        "no-new-func": 2,
-        "no-native-reassign": 2,
-        "no-delete-var": 2,
-        "no-return-assign": 2,
-        "no-new-object": 2,
-        "no-label-var": 2,
-        "no-self-compare": 2,
-        "no-sync": 2,
-        "no-loop-func": 2,
-        "no-empty-label": 2,
-        "no-unused-vars": 1,
-        "no-script-url": 2,
-        "no-proto": 2,
-        "no-iterator": 2,
-        "no-mixed-requires": [0, false],
-        "no-wrap-func": 2,
-        "no-shadow": 2,
-        "no-use-before-define": 2,
-        "no-redeclare": 2,
-        "no-regex-spaces": 2,
-        "no-mixed-spaces-and-tabs": 2,
-        "no-underscore-dangle": 0,
+rules:
+  comma-dangle: 2
+  no-alert: 2
+  no-array-constructor: 2
+  no-caller: 2
+  no-catch-shadow: 2
+  no-control-regex: 2
+  no-debugger: 2
+  no-div-regex: 2
+  no-dupe-keys: 2
+  no-else-return: 2
+  no-empty: 2
+  no-empty-class: 2
+  no-eq-null: 2
+  no-eval: 2
+  no-ex-assign: 2
+  no-func-assign: 0
+  no-floating-decimal: 2
+  no-implied-eval: 2
+  no-with: 2
+  no-fallthrough: 2
+  no-unreachable: 2
+  no-undef: 2
+  no-undef-init: 2
+  no-unused-expressions: 2
+  no-octal: 2
+  no-octal-escape: 2
+  no-obj-calls: 2
+  no-multi-str: 2
+  no-new-wrappers: 2
+  no-new: 2
+  no-new-func: 2
+  no-native-reassign: 2
+  no-delete-var: 2
+  no-return-assign: 2
+  no-new-object: 2
+  no-label-var: 2
+  no-self-compare: 2
+  no-sync: 2
+  no-loop-func: 2
+  no-empty-label: 2
+  no-unused-vars: 1
+  no-script-url: 2
+  no-proto: 2
+  no-iterator: 2
+  no-mixed-requires:
+    - 0
+    - false
+  no-wrap-func: 2
+  no-shadow: 2
+  no-use-before-define: 2
+  no-redeclare: 2
+  no-regex-spaces: 2
+  no-mixed-spaces-and-tabs: 2
+  no-underscore-dangle: 0
 
-        "brace-style": 2,
-        "camelcase": 2,
-        "consistent-this": [2, "self"],
-        "curly": 2,
-        "dot-notation": 2,
-        "eqeqeq": 2,
-        "new-cap": 2,
-        "new-parens": 2,
-        "quotes": [2, "single"],
-        "semi": 2,
-        "strict": [2, "global"],
-        "use-isnan": 2,
-        "valid-typeof": 2,
-        "wrap-iife": 2,
-        "indent": [2, 4, {indentSwitchCase: true}]
-    }
-}
+  brace-style: 2
+  camelcase: 2
+  consistent-this:
+    - 2
+    - self
+  curly: 2
+  dot-notation: 2
+  eqeqeq: 2
+  new-cap: 2
+  new-parens: 2
+  quotes:
+    - 2
+    - single
+  semi: 2
+  strict:
+    - 2
+    - global
+  use-isnan: 2
+  valid-typeof: 2
+  wrap-iife: 2
+  indent:
+    - 2
+    - indentSwitchCase: true

README.md

@@ -140,6 +140,7 @@ by Express.
 
 [Most Recent Release Notes][release-notes]
 
+* [v1.4.3][release-v1.4.3] - June 3, 2015
 * [v1.4.2][release-v1.4.2] - April 30, 2015
 * [v1.4.1][release-v1.4.1] - April 14, 2015
 * [v1.4.0][release-v1.4.0] - April 12, 2015
@@ -172,6 +173,7 @@ Licensed under [MIT](https://github.com/howardabrams/node-mocks-http/blob/master
 
 [release-notes]: https://github.com/howardabrams/node-mocks-http/releases
 
+[release-v1.4.3]: https://github.com/howardabrams/node-mocks-http/releases/tag/v1.4.3
 [release-v1.4.2]: https://github.com/howardabrams/node-mocks-http/releases/tag/v1.4.2
 [release-v1.4.1]: https://github.com/howardabrams/node-mocks-http/releases/tag/v1.4.1
 [release-v1.4.0]: https://github.com/howardabrams/node-mocks-http/releases/tag/v1.4.0

lib/mockResponse.js

@@ -242,6 +242,10 @@ function createResponse(options) {
                 _data += JSON.stringify(b);
             }
         }
+
+        mockResponse.emit('send');
+        mockResponse.emit('end');
+
     };
 
     /**

package.json

@@ -2,7 +2,7 @@
   "author": "Howard Abrams <howard.abrams@gmail.com> (http://www.github.com/howardabrams)",
   "name": "node-mocks-http",
   "description": "Mock 'http' objects for testing Express routing functions",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "homepage": "https://github.com/howardabrams/node-mocks-http",
   "bugs": {
     "url": "https://github.com/howardabrams/node-mocks-http/issues"
@@ -44,11 +44,10 @@
   },
   "devDependencies": {
     "chai": "^2.2.0",
-    "eslint": "^0.18.0",
-    "eslint-plugin-mocha": "^0.2.2",
+    "eslint": "^0.22.1",
     "gulp": "^3.8.11",
-    "gulp-eslint": "^0.8.0",
-    "gulp-istanbul": "^0.8.1",
+    "gulp-eslint": "^0.12.0",
+    "gulp-istanbul": "^0.9.0",
     "gulp-mocha": "^2.0.1",
     "istanbul": "^0.3.13",
     "mocha": "^2.2.4",

test/.eslintrc

@@ -1,88 +1,10 @@
-{
-    "env": {
-        "node": true
-    },
+extends: ../.eslintrc
 
-    "plugins": ["mocha"],
+env:
+  mocha: true
 
-    "globals": {
-        "describe": 1,
-        "it": 1,
-        "before": 1,
-        "beforeEach": 1,
-        "after": 1,
-        "afterEach": 1
-    },
-
-    "rules": {
-        "mocha/no-exclusive-tests": 2,
-        "comma-dangle": 2,
-        "no-alert": 2,
-        "no-array-constructor": 2,
-        "no-caller": 2,
-        "no-catch-shadow": 2,
-        "no-control-regex": 2,
-        "no-debugger": 2,
-        "no-div-regex": 2,
-        "no-dupe-keys": 2,
-        "no-else-return": 2,
-        "no-empty": 2,
-        "no-empty-class": 2,
-        "no-eq-null": 2,
-        "no-eval": 2,
-        "no-ex-assign": 2,
-        "no-func-assign": 0,
-        "no-floating-decimal": 2,
-        "no-implied-eval": 2,
-        "no-with": 2,
-        "no-fallthrough": 2,
-        "no-unreachable": 2,
-        "no-undef": 2,
-        "no-undef-init": 2,
-        "no-unused-expressions": 0,
-        "no-octal": 2,
-        "no-octal-escape": 2,
-        "no-obj-calls": 2,
-        "no-multi-str": 2,
-        "no-new-wrappers": 2,
-        "no-new": 2,
-        "no-new-func": 2,
-        "no-native-reassign": 2,
-        "no-delete-var": 2,
-        "no-return-assign": 2,
-        "no-new-object": 2,
-        "no-label-var": 2,
-        "no-self-compare": 2,
-        "no-sync": 2,
-        "no-loop-func": 2,
-        "no-empty-label": 2,
-        "no-unused-vars": 1,
-        "no-script-url": 2,
-        "no-proto": 2,
-        "no-iterator": 2,
-        "no-mixed-requires": [0, false],
-        "no-wrap-func": 2,
-        "no-shadow": 2,
-        "no-use-before-define": 2,
-        "no-redeclare": 2,
-        "no-regex-spaces": 2,
-        "no-mixed-spaces-and-tabs": 2,
-        "no-underscore-dangle": 0,
-
-        "brace-style": 2,
-        "camelcase": 2,
-        "consistent-this": [2, "self"],
-        "curly": 2,
-        "dot-notation": 2,
-        "eqeqeq": 2,
-        "new-cap": 2,
-        "new-parens": 2,
-        "quotes": [2, "single"],
-        "semi": 2,
-        "strict": [2, "global"],
-        "use-isnan": 2,
-        "valid-typeof": 2,
-        "wrap-iife": 2,
-        "indent": [2, 2, {"indentSwitchCase": true}]
-    }
-}
+rules:
+  no-unused-expressions: 0
+  indent:
+    - 2
+    - 2

test/lib/mockResponse.spec.js

@@ -465,9 +465,27 @@ describe('mockResponse', function() {
 
     // TODO: fix in 2.0; method should mimic Express Response.json()
     describe('.json()', function() {
+      var response;
+
+      beforeEach(function() {
+        response = mockResponse.createResponse();
+        sinon.spy(response, 'emit');
+      });
+
+      afterEach(function() {
+        response.emit.restore();
+        response = null;
+      });
 
       it('method should mimic Express Response.json()');
 
+      it('should emit send and end events', function() {
+        response.json({});
+        expect(response.emit).to.have.been.calledTwice;
+        expect(response.emit).to.have.been.calledWith('send');
+        expect(response.emit).to.have.been.calledWith('end');
+      });
+
     });
 
     // TODO: fix in 2.0; method should mimic Express Response.redirect()