nock 9.0.9 → 9.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (69) hide show
  1. package/.npmignore +2 -0
  2. package/.travis.yml +1 -1
  3. package/CHANGELOG.md +9 -4
  4. package/lib/intercept.js +5 -0
  5. package/lib/match_body.js +1 -1
  6. package/package.json +6 -2
  7. package/.nyc_output/0cfc9aa0c50eae765941a555f8482a68.json +0 -1
  8. package/.nyc_output/0ecdf591be62cb4571ebf9c4df59da37.json +0 -1
  9. package/.nyc_output/1df5c7adcf4885ae588bf8be3e508036.json +0 -1
  10. package/.nyc_output/2db2fc1c81ebebec5066673d7751e720.json +0 -1
  11. package/.nyc_output/2f9ccd224c0ce9793bb47cb95818e613.json +0 -1
  12. package/.nyc_output/302922273ee8b73467d3d8f160d41764.json +0 -1
  13. package/.nyc_output/402abf6bfd9ba80ba17d063c7aff8c5c.json +0 -1
  14. package/.nyc_output/4192a6afdd7ca9d506a9007e60f313c6.json +0 -1
  15. package/.nyc_output/4db6e0367725f3697aff401f14e83d8e.json +0 -1
  16. package/.nyc_output/51727eb8342f2b80aad8f5cf58247bb8.json +0 -1
  17. package/.nyc_output/53edcbd3a01e01726702fd59ad18528c.json +0 -1
  18. package/.nyc_output/58b1c38b2f1be3dcecbca9bab068a18f.json +0 -1
  19. package/.nyc_output/5c23da3e51b1f6cb82b2337ac4b79674.json +0 -1
  20. package/.nyc_output/6e39c409325db21e0a6645f24d62ea78.json +0 -1
  21. package/.nyc_output/71230f985baca9b3c3a5c96f7db17ce3.json +0 -1
  22. package/.nyc_output/75853f8bad86af123b6ab837115f9154.json +0 -1
  23. package/.nyc_output/79b9684388f3f8d578c0960b2cc38567.json +0 -1
  24. package/.nyc_output/83796d88fa4f05b5616674d83b9ea40a.json +0 -1
  25. package/.nyc_output/9d996c278cdb585d083b6f2cd90514a7.json +0 -1
  26. package/.nyc_output/a5f208db2341f743b5cd29d3fb47f97c.json +0 -1
  27. package/.nyc_output/ae6685d46041b4ede6cc2c43ca0e6021.json +0 -1
  28. package/.nyc_output/b0199893e52a27aa0d6c7ffdc52ae9d1.json +0 -1
  29. package/.nyc_output/d5d71e5d97fce722c611ef2e65170947.json +0 -1
  30. package/.nyc_output/d91d008aa4d6431aa91127a791303d24.json +0 -1
  31. package/.nyc_output/deceb761e61a0f642f51a304fae33d8a.json +0 -1
  32. package/.nyc_output/dfceb102965a150e5812732c638882ef.json +0 -1
  33. package/.nyc_output/e0656fe48b57b517e2c979a8a1578639.json +0 -1
  34. package/.nyc_output/e59e4c5a4d398d7ff45be9f48a01a932.json +0 -1
  35. package/.nyc_output/fecdd97de458efb187320ed600a1253c.json +0 -1
  36. package/tests/browserify-public/.gitkeep +0 -0
  37. package/tests/browserify-public/browserify-bundle.js +0 -43055
  38. package/tests/browserify-public/index.html +0 -2
  39. package/tests/fixtures/browserify-script.js +0 -19
  40. package/tests/fixtures/goodRequest.json +0 -26
  41. package/tests/fixtures/wrongUri.json +0 -50
  42. package/tests/test_abort.js +0 -59
  43. package/tests/test_aws_dynamo.js +0 -39
  44. package/tests/test_back.js +0 -341
  45. package/tests/test_back_2.js +0 -75
  46. package/tests/test_basic_auth.js +0 -79
  47. package/tests/test_body_match.js +0 -68
  48. package/tests/test_browserify.js +0 -54
  49. package/tests/test_common.js +0 -242
  50. package/tests/test_complex_querystring.js +0 -158
  51. package/tests/test_content_encoding.js +0 -26
  52. package/tests/test_data.js +0 -28
  53. package/tests/test_dynamic_mock.js +0 -92
  54. package/tests/test_encode_querystring.js +0 -22
  55. package/tests/test_events.js +0 -63
  56. package/tests/test_gzip_request.js +0 -74
  57. package/tests/test_https_allowunmocked.js +0 -25
  58. package/tests/test_intercept.js +0 -5009
  59. package/tests/test_ipv6.js +0 -55
  60. package/tests/test_isomorphic_fetch.js +0 -104
  61. package/tests/test_net_connect.js +0 -17
  62. package/tests/test_nock_off.js +0 -26
  63. package/tests/test_recorder.js +0 -896
  64. package/tests/test_redirects.js +0 -28
  65. package/tests/test_request_promise.js +0 -25
  66. package/tests/test_s3.js +0 -99
  67. package/tests/test_scope_interceptors.js +0 -11
  68. package/tests/test_timeout.js +0 -21
  69. package/tests/test_url_encoding.js +0 -17
package/.npmignore CHANGED
@@ -1,3 +1,5 @@
1
1
  node_modules
2
2
  .gitignore
3
3
  coverage
4
+ .nyc_output
5
+ tests
package/.travis.yml CHANGED
@@ -3,6 +3,6 @@ node_js:
3
3
  - 4
4
4
  - 6
5
5
  - 7
6
- script: "npm run coverage"
6
+ script: "npm run coverage && npm run integration"
7
7
  sudo: false
8
8
  after_success: "npm run coveralls"
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ 9.0.9 / 2017-02-28
2
+ ==================
3
+
4
+ * 9.0.9: Revert PR [#802](https://github.com/node-nock/nock/issues/802)
5
+ * Merge pull request [#840](https://github.com/node-nock/nock/issues/840) from node-nock/revert-802-fix-754
6
+ Revert "Fix request timeout no working"
7
+ * Revert "Fix request timeout no working"
8
+ * Changelog v9.0.8
9
+
1
10
  9.0.8 / 2017-02-27
2
11
  ==================
3
12
 
@@ -172,7 +181,3 @@
172
181
  * chore(package): update async to version 2.1.1
173
182
  https://greenkeeper.io/
174
183
  * Ad documentation for optionally()
175
- * Add optionally(), to replace and improve the undocumented 'requireDone'
176
- * Make pendingMocks and isDone behave consistently
177
- * Removed coverage folder from npm
178
- * Update PendingMocks when an interceptor is removed
package/lib/intercept.js CHANGED
@@ -123,6 +123,11 @@ function remove(interceptor) {
123
123
  }
124
124
 
125
125
  function removeAll() {
126
+ Object.keys(allInterceptors).forEach(function(key) {
127
+ allInterceptors[key].scopes.forEach(function(interceptor) {
128
+ interceptor.scope.keyedInterceptors = {};
129
+ });
130
+ });
126
131
  allInterceptors = {};
127
132
  }
128
133
 
package/lib/match_body.js CHANGED
@@ -29,7 +29,7 @@ function matchBody(spec, body) {
29
29
  return body.match(spec);
30
30
  }
31
31
 
32
- if (typeof spec === "string") {
32
+ if (!isMultipart && typeof spec === "string") {
33
33
  spec = spec.replace(/\r?\n|\r/g, '');
34
34
  }
35
35
 
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "testing",
8
8
  "isolation"
9
9
  ],
10
- "version": "9.0.9",
10
+ "version": "9.0.13",
11
11
  "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
12
12
  "contributors": [
13
13
  {
@@ -182,6 +182,7 @@
182
182
  "browserify": "^13.0.0",
183
183
  "changelog": "^1.0.7",
184
184
  "coveralls": "^2.11.2",
185
+ "glob": "^7.1.1",
185
186
  "hyperquest": "^1.3.0",
186
187
  "isomorphic-fetch": "^2.2.0",
187
188
  "istanbul": "^0.4.2",
@@ -201,7 +202,10 @@
201
202
  "zombie": "^5.0.1"
202
203
  },
203
204
  "scripts": {
204
- "test": "tap --harmony ./tests/test_*.js",
205
+ "unit": "tap --harmony ./tests/test_*.js",
206
+ "preintegration": "./tests/bin/install_sub_deps versioned",
207
+ "integration": "tap --harmony ./tests/versioned/*/*.tap.js",
208
+ "test": "npm run unit && npm run integration",
205
209
  "coverage": "nyc tap --harmony ./tests/test_*.js",
206
210
  "coveralls": "cat ./coverage/lcov.info | coveralls",
207
211
  "jshint": "jshint lib/*.js",