Merge pull request #141 from apiaryio/kubula/update_hipchat_notification

Fix cli-test by freezing devDependency clone@0.x

Author: Adam Kliment

.travis.yml

@@ -1,8 +1,9 @@
 language: node_js
 node_js:
   - 0.10
+sudo: false
 before_install:
-  - npm install -g npm@~1.4.6
+  - npm install -g npm@1.4.28
 notifications:
   email:
     recipients:
@@ -13,7 +14,7 @@ notifications:
     on_failure: always
   hipchat:
     rooms:
-      secure: "pKDBboEmYne/Hs9qUSCQCgWZ9insdvgvB0DyMYYpO8RHgNOAhpcY1Kz/wTmFtm1k2HjGNGx1OVgVhOYXwIiJQZbmiUT4gVDEUtmpSgiW3/uQATgaPFUAsaIFqemTPgI6Q8RfsJZQk1kRMioZhk0ldQY5A+AUIKYKg1BFiOsrO1s="
+      secure: "QGWyFDPoKcj97epznHoyriuS/eJIbgZtTAVVM6M3IpgwgTX2LuiGVJbUvZy1BDlp31sYTLslrZ4zHeBwbOoy8zrM0KW8pr+pvgzO+EAsNchd9Ox9SqA0E/4gnaRg0myZIb67YM0hB9NEXT5sAOv9EoEae2SXw2KeoX1Myg+wsI4="
     template:
       - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (<a href="%{build_url}">Details</a>/<a href="%{compare_url}">Change view</a>)'
     format: html

package.json

@@ -35,7 +35,7 @@
   "devDependencies": {
     "body-parser": "^1.10.2",
     "chai": "^1.10.0",
-    "clone": "",
+    "clone": "^0.x",
     "codo": "2.0.9",
     "coffee-coverage": "~0.4.4",
     "coffee-errors": "~0.8.6",

test/integration/cli-test.coffee

@@ -122,9 +122,9 @@ describe "Command line interface", () ->
         assert.equal exitStatus, 1
 
   describe "when called with arguments", () ->
-
     describe "when using reporter -r apiary", () ->
-
+      server = null
+      server2 = null
       receivedRequest = null
 
       before (done) ->
@@ -133,11 +133,11 @@ describe "Command line interface", () ->
         apiary = express()
         app = express()
 
-        apiary.use bodyParser.json(size:'1mb')
+        apiary.use bodyParser.json(size:'5mb')
 
         apiary.post '/apis/*', (req, res) ->
-          if req.url.indexOf('/public/tests/steps') > -1
-            receivedRequest ?= req.body
+          if req.body and req.url.indexOf('/tests/steps') > -1
+            receivedRequest ?= clone(req.body, false)
           res.type('json')
           res.status(201).send
             _id: '1234_id'
@@ -146,7 +146,7 @@ describe "Command line interface", () ->
 
         apiary.all '*', (req, res) ->
           res.type 'json'
-          res.status(200).send {}
+          res.send {}
 
         app.get '/machines', (req, res) ->
           res.setHeader 'Content-Type', 'application/json'
@@ -158,8 +158,8 @@ describe "Command line interface", () ->
 
         server = app.listen PORT, () ->
           server2 = apiary.listen (PORT+1), ->
-            env = clone process.env
-            env['APIARY_API_URL'] = "http://localhost:#{PORT+1}"
+            env = clone process.env, false
+            env['APIARY_API_URL'] = "http://127.0.0.1:#{PORT+1}"
             execCommand cmd, {env}, () ->
               server2.close ->
                 server.close ->
@@ -180,16 +180,12 @@ describe "Command line interface", () ->
 
 
     describe "when using additional reporters with -r", () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -r nyan"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -209,16 +205,12 @@ describe "Command line interface", () ->
 
 
     describe 'when using an output path with -o', () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -r junit -o test_file_output.xml"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -241,15 +233,15 @@ describe "Command line interface", () ->
 
     describe "when adding additional headers with -h", () ->
 
-      recievedRequest = {}
+      receivedRequest = {}
 
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -h Accept:application/json"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
+          receivedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -264,20 +256,20 @@ describe "Command line interface", () ->
         server.on 'close', done
 
       it 'should have an additional header in the request', () ->
-        assert.ok recievedRequest.headers.accept is 'application/json'
+        assert.deepPropertyVal receivedRequest, 'headers.accept', 'application/json'
 
 
     describe "when adding basic auth credentials with -u", () ->
 
-      recievedRequest = {}
+      receivedRequest = {}
 
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -u username:password"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
+          receivedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -292,23 +284,19 @@ describe "Command line interface", () ->
         server.on 'close', done
 
       it 'should have an authorization header in the request', () ->
-        assert.ok recievedRequest.headers.authorization
+        assert.ok receivedRequest.headers.authorization
 
       it 'should contain a base64 encoded string of the username and password', () ->
-        assert.ok recievedRequest.headers.authorization is 'Basic ' + new Buffer('username:password').toString('base64')
+        assert.ok receivedRequest.headers.authorization is 'Basic ' + new Buffer('username:password').toString('base64')
 
 
     describe "when sorting requests with -s", () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/apiary.apib http://localhost:#{PORT} -s"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -353,16 +341,12 @@ describe "Command line interface", () ->
         assert.equal count, 2
 
     describe 'when showing details for all requests with -d', () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -d"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -384,15 +368,15 @@ describe "Command line interface", () ->
 
       describe 'when blocking a request', () ->
 
-        recievedRequest = {}
+        receivedRequest = {}
 
         before (done) ->
           cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -m POST"
 
           app = express()
 
           app.get '/machines', (req, res) ->
-            recievedRequest = req
+            receivedRequest = req
             res.setHeader 'Content-Type', 'application/json'
             machine =
               type: 'bulldozer'
@@ -407,19 +391,19 @@ describe "Command line interface", () ->
           server.on 'close', done
 
         it 'should not send the request request', () ->
-          assert.deepEqual recievedRequest, {}
+          assert.deepEqual receivedRequest, {}
 
       describe 'when not blocking a request', () ->
 
-        recievedRequest = {}
+        receivedRequest = {}
 
         before (done) ->
           cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -m GET"
 
           app = express()
 
           app.get '/machines', (req, res) ->
-            recievedRequest = req
+            receivedRequest = req
             res.setHeader 'Content-Type', 'application/json'
             machine =
               type: 'bulldozer'
@@ -434,7 +418,7 @@ describe "Command line interface", () ->
           server.on 'close', done
 
         it 'should allow the request to go through', () ->
-          assert.ok recievedRequest.headers
+          assert.ok receivedRequest.headers
 
     describe "when filtering transaction to particular name with -x or --only", () ->
 
@@ -478,16 +462,12 @@ describe "Command line interface", () ->
         assert.equal exitStatus, 0
 
     describe 'when suppressing color with --no-color', () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} --no-color"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -507,16 +487,12 @@ describe "Command line interface", () ->
         assert.include stdout, 'pass:'
 
     describe 'when suppressing color with --color false', () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} --color false"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -536,16 +512,12 @@ describe "Command line interface", () ->
         assert.include stdout, 'pass:'
 
     describe 'when setting the log output level with -l', () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -l=error"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -564,16 +536,12 @@ describe "Command line interface", () ->
         assert.ok stdout.indexOf 'complete' is -1
 
     describe 'when showing timestamps with -t', () ->
-
-      recievedRequest = {}
-
       before (done) ->
         cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} -t"
 
         app = express()
 
         app.get '/machines', (req, res) ->
-          recievedRequest = req
           res.setHeader 'Content-Type', 'application/json'
           machine =
             type: 'bulldozer'
@@ -593,15 +561,15 @@ describe "Command line interface", () ->
 
   describe 'when loading hooks with --hookfiles', () ->
 
-    recievedRequest = {}
+    receivedRequest = {}
 
     before (done) ->
       cmd = "./bin/dredd ./test/fixtures/single-get.apib http://localhost:#{PORT} --hookfiles=./test/fixtures/*_hooks.*"
 
       app = express()
 
       app.get '/machines', (req, res) ->
-        recievedRequest = req
+        receivedRequest = req
         res.setHeader 'Content-Type', 'application/json'
         machine =
           type: 'bulldozer'
@@ -616,13 +584,10 @@ describe "Command line interface", () ->
       server.on 'close', done
 
     it 'should modify the transaction with hooks', () ->
-      assert.equal recievedRequest.headers['header'], '123232323'
+      assert.equal receivedRequest.headers['header'], '123232323'
 
   describe 'when describing events in hookfiles', () ->
-
-    recievedRequest = {}
     output = {}
-
     containsLine = (str, expected) ->
       lines = str.split('\n')
       for line in lines
@@ -636,7 +601,6 @@ describe "Command line interface", () ->
       app = express()
 
       app.get '/machines', (req, res) ->
-        recievedRequest = req
         res.setHeader 'Content-Type', 'application/json'
         machine =
           type: 'bulldozer'
@@ -657,10 +621,7 @@ describe "Command line interface", () ->
       assert.ok containsLine(output.stdout, 'afterAll')
 
   describe 'when describing both hooks and events in hookfiles', () ->
-
-    recievedRequest = {}
     output = {}
-
     getResults = (str) ->
       ret = []
       lines = str.split('\n')
@@ -675,7 +636,6 @@ describe "Command line interface", () ->
       app = express()
 
       app.get '/machines', (req, res) ->
-        recievedRequest = req
         res.setHeader 'Content-Type', 'application/json'
         machine =
           type: 'bulldozer'
@@ -800,7 +760,7 @@ describe "Command line interface", () ->
         assert.equal exitStatus, 0
 
       it 'server should receive 3 requests', () ->
-        assert.equal receivedRequests.length, 3
+        assert.lengthOf receivedRequests, 3
 
 
   describe "when called with additional --path argument which is a glob", () ->