Skip to content

Commit

Permalink
Merge d094fcc into 5af77f0
Browse files Browse the repository at this point in the history
  • Loading branch information
ksmith97 committed Oct 19, 2016
2 parents 5af77f0 + d094fcc commit 46a7b0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/interceptor.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var mixin = require('./mixin')
, matchBody = require('./match_body')
, common = require('./common')
, _ = require('lodash')
, debug = require('debug')('nock.scope')
, debug = require('debug')('nock.interceptor')
, stringify = require('json-stringify-safe')
, util = require('util')
, qs = require('qs');
Expand Down
4 changes: 2 additions & 2 deletions tests/test_intercept.js
Original file line number Diff line number Diff line change
Expand Up @@ -2547,7 +2547,7 @@ test("allow unmocked option works with https", function(t) {
});


test('allow unmocked post with json data', function(t) {
test('allow unmocked post with json data', { timeout: (5 * 60 * 1000) }, function(t) {
var scope = nock('https://httpbin.org', { allowUnmocked: true }).
get("/abc").
reply(200, "Hey!");
Expand All @@ -2564,7 +2564,7 @@ test('allow unmocked post with json data', function(t) {
});
});

test('allow unmocked passthrough with mismatched bodies', function(t) {
test('allow unmocked passthrough with mismatched bodies', { timeout: (5 * 60 * 1000) }, function(t) {
var scope = nock('http://httpbin.org', { allowUnmocked: true }).
post("/post", {some: 'otherdata'}).
reply(404, "Hey!");
Expand Down

0 comments on commit 46a7b0b

Please sign in to comment.