Skip to content

Commit

Permalink
Upgraded dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Kliment committed Mar 30, 2015
1 parent 074b033 commit 972b38b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"node-uuid": "~1.4.2",
"optimist": "~0.6.1",
"pitboss": "git://github.com/apiaryio/pitboss",
"protagonist": "~0.17.2",
"protagonist": "^0.19.0",
"proxyquire": "^1.3.1",
"request": "^2.53.0",
"setimmediate": "^1.0.2",
Expand All @@ -39,7 +39,7 @@
},
"devDependencies": {
"body-parser": "^1.12.0",
"codo": "2.0.9",
"codo": "^2.0.11",
"coffee-coverage": "~0.4.5",
"coffee-errors": "~0.8.6",
"coffeelint": "^1.9.2",
Expand All @@ -48,7 +48,7 @@
"jscoverage": "~0.5.9",
"mocha": "^2.1.0",
"mocha-lcov-reporter": "0.0.2",
"nock": "^0.59.1",
"nock": "^1.4.0",
"sinon": "^1.12.2"
},
"keywords": [
Expand Down
7 changes: 7 additions & 0 deletions test/unit/reporters/apiary-reporter-test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{EventEmitter} = require 'events'
proxyquire = require 'proxyquire'
nock = require 'nock'
nock.enableNetConnect()
clone = require 'clone'
sinon = require 'sinon'
loggerStub = require '../../../src/logger'
Expand All @@ -24,6 +25,12 @@ describe 'ApiaryReporter', () ->
sinon.stub loggerStub.info.restore()
sinon.stub loggerStub.complete.restore()

before () ->
nock.disableNetConnect()

after () ->
nock.enableNetConnect()

describe 'without API key or without suite', () ->
stats = {}
tests = []
Expand Down
10 changes: 10 additions & 0 deletions test/unit/transaction-runner-test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ require 'coffee-errors'
{assert} = require 'chai'
clone = require 'clone'
nock = require 'nock'
nock.enableNetConnect()

proxyquire = require 'proxyquire'
sinon = require 'sinon'
express = require 'express'
Expand Down Expand Up @@ -40,9 +42,11 @@ describe 'TransactionRunner', ()->

before () ->
loggerStub.transports.console.silent = true
nock.disableNetConnect()

after () ->
loggerStub.transports.console.silent = false
nock.enableNetConnect()

describe 'constructor', () ->

Expand Down Expand Up @@ -1238,6 +1242,12 @@ describe 'TransactionRunner', ()->
done()

describe 'with hook modifying the transaction body and backend Express app using the body parser', () ->
before () ->
nock.enableNetConnect()

after () ->
nock.disableNetConnect()

it 'should perform the transaction and don\'t hang', (done) ->
nock.cleanAll()

Expand Down

0 comments on commit 972b38b

Please sign in to comment.