Added tests for content-length headers setting

Author: Adam Kliment

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dredd",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "API Blueprint testing tool",
   "main": "lib/dredd.js",
   "bin": {

src/execute-transaction.coffee

@@ -52,7 +52,11 @@ executeTransaction = (transaction, callback) ->
       " ("+ system + ")"
 
   # Add length of body if no Content-Length present
-  if flatHeaders['Content-Length'] == undefined and request['body'] != ''
+  caseInsensitiveMap = {}
+  for key, value of flatHeaders
+    caseInsensitiveMap[key.toLowerCase()] = key
+  
+  if caseInsensitiveMap['content-length'] == undefined and request['body'] != ''
     flatHeaders['Content-Length'] = request['body'].length
 
   if configuration.request?.headers?
@@ -85,7 +89,7 @@ executeTransaction = (transaction, callback) ->
         buffer = buffer + chunk
 
       req.on 'error', (error) ->
-        return callback error
+        return callback error, req, res
 
       res.on 'end', () ->
         real =
@@ -100,19 +104,19 @@ executeTransaction = (transaction, callback) ->
           statusCode: response['status']
 
         gavel.isValid real, expected, 'response', (error, isValid) ->
-          return callback error if error
+          return callback error, req, res if error
 
           if isValid
             test =
               status: "pass",
               title: options['method'] + ' ' + options['path']
               message: description
             configuration.reporter.addTest test, (error) ->
-              return callback error if error
-            return callback()
+              return callback error, req, res if error
+            return callback(undefined, req, res)
           else
             gavel.validate real, expected, 'response', (error, result) ->
-              return callback(error) if error
+              return callback(error, req, res) if error
               message = ''
               for entity, data of result
                 for entityResult in data['results']
@@ -125,8 +129,8 @@ executeTransaction = (transaction, callback) ->
                 expected: prettify expected
                 request: options
               configuration.reporter.addTest test, (error) ->
-                return callback error if error
-              return callback()
+                return callback error, req, res if error
+              return callback(undefined, req, res)
 
     if configuration.server.startsWith 'https'
       req = https.request options, handleRequest

test/unit/execute-transaction-test.coffee

@@ -12,29 +12,32 @@ CliReporter = require '../../src/cli-reporter'
 
 describe 'executeTransaction(transaction, callback)', () ->
   transaction =
-    request:
-      body: "{\n  \"type\": \"bulldozer\",\n  \"name\": \"willy\"}\n"
-      headers:
-        "Content-Type":
-          value: "application/json"
-      uri: "/machines",
-      method: "POST"
-    response:
-      body: "{\n  \"type\": \"bulldozer\",\n  \"name\": \"willy\",\n  \"id\": \"5229c6e8e4b0bd7dbb07e29c\"\n}\n"
-      headers:
-        "content-type":
-          value: "application/json"
-      status: "202"
-    origin:
-      resourceGroupName: "Group Machine"
-      resourceName: "Machine"
-      actionNames: "Delete Message"
-      exampleName: "Bogus example name"
-    configuration:
-      server: 'http://localhost:3000'
-      options: []
+
 
   beforeEach () ->
+    transaction =
+      request:
+        body: "{\n  \"type\": \"bulldozer\",\n  \"name\": \"willy\"}\n"
+        headers:
+          "Content-Type":
+            value: "application/json"
+        uri: "/machines",
+        method: "POST"
+      response:
+        body: "{\n  \"type\": \"bulldozer\",\n  \"name\": \"willy\",\n  \"id\": \"5229c6e8e4b0bd7dbb07e29c\"\n}\n"
+        headers:
+          "content-type":
+            value: "application/json"
+        status: "202"
+      origin:
+        resourceGroupName: "Group Machine"
+        resourceName: "Machine"
+        actionNames: "Delete Message"
+        exampleName: "Bogus example name"
+      configuration:
+        server: 'http://localhost:3000'
+        options: []
+
     nock.disableNetConnect()
 
   afterEach () ->
@@ -45,7 +48,63 @@ describe 'executeTransaction(transaction, callback)', () ->
   data = {}
   server = {}
 
-  describe 'backend responds as it should', () ->
+  describe 'setting of content-length header', () ->
+    describe 'when content-length header is not present in the specified request', () ->
+      beforeEach () ->
+        server = nock('http://localhost:3000').
+          post('/machines', {"type":"bulldozer","name":"willy"}).
+          reply transaction['response']['status'],
+            transaction['response']['body'],
+            {'Content-Type': 'application/json'}
+        transaction['configuration'].reporter = new CliReporter()
+        nock.recorder.rec(true)
+
+      it 'should send content length header ', (done) ->
+        executeTransaction transaction, (error, req, res) ->
+          assert.isDefined req._headers['content-length']
+          done()
+
+      it 'sent content-length header should have proper value', (done) ->
+        executeTransaction transaction, (error, req, res) ->
+          assert.equal req._headers['content-length'], 44
+          done()
+
+
+    describe 'when content-length header is present in the specified request', () ->
+      beforeEach () ->
+        transaction['configuration'].reporter = new CliReporter()
+
+        server = nock('http://localhost:3000').
+          post('/machines', {"type":"bulldozer","name":"willy"}).
+          reply transaction['response']['status'],
+            transaction['response']['body'],
+            {'Content-Type': 'application/json'}      
+
+      it 'should not overwrite specified value', (done) ->
+        transaction['request']['headers']['Content-Length'] = {}
+        transaction['request']['headers']['Content-Length']['value'] = '333'
+        executeTransaction transaction, (error, req, res) ->
+          assert.equal req._headers['content-length'], '333'
+          done()
+
+      it 'matching of content-length header in specification should be case insensitive', (done) ->
+        transaction['request']['headers']['CONTENT-LENGTH'] = {}
+        transaction['request']['headers']['CONTENT-LENGTH']['value'] = '777'
+        executeTransaction transaction, (error, req, res) ->
+          assert.equal req._headers['content-length'], '777'
+          done()
+
+
+      it 'should not add another content-length header to the real request', (done) ->
+        transaction['request']['headers']['content-length'] = {}
+        transaction['request']['headers']['content-length']['value'] = '445'
+        executeTransaction transaction, (error, req, res) ->
+          assert.equal req._headers['content-length'], '445'
+          done()
+
+
+
+  describe 'when backend responds as it should', () ->
     beforeEach () ->
       server = nock('http://localhost:3000').
         post('/machines', {"type":"bulldozer","name":"willy"}).
@@ -65,8 +124,9 @@ describe 'executeTransaction(transaction, callback)', () ->
         assert.notOk error
         done()
 
-  describe 'backend responds with non valid response', () ->
+  describe 'when backend responds with non valid response', () ->
     beforeEach () ->
+      transaction['configuration'].reporter = new CliReporter()
       server = nock('http://localhost:3000').
         post('/machines', {"type":"bulldozer","name":"willy"}).
         reply transaction['response']['status'],
@@ -81,6 +141,7 @@ describe 'executeTransaction(transaction, callback)', () ->
 
   describe 'when there are global headers in the configuration', () ->
     beforeEach () ->
+      transaction['configuration'].reporter = new CliReporter()
       server = nock('http://localhost:3000').
         post('/machines', {"type":"bulldozer","name":"willy"}).
         matchHeader('X-Header', 'foo').
@@ -99,6 +160,7 @@ describe 'executeTransaction(transaction, callback)', () ->
 
   describe 'when server uses https', () ->
     beforeEach () ->
+      transaction['configuration'].reporter = new CliReporter()
       server = nock('https://localhost:3000').
         post('/machines', {"type":"bulldozer","name":"willy"}).
         reply transaction['response']['status'],
@@ -113,30 +175,25 @@ describe 'executeTransaction(transaction, callback)', () ->
 
   describe 'when server responds with html', () ->
     beforeEach () ->
-      nock('https://localhost:3000').
+      transaction['configuration'].reporter = new CliReporter()
+      nock('http://localhost:3000').
         post('/machines', {"type":"bulldozer","name":"willy"}).
         reply transaction['response']['status'],
           transaction['response']['body'],
-          {'Content-Type': 'application/json'}
+          {'Content-Type': 'text/html'}
       sinon.spy htmlStub, 'prettyPrint'
-      transaction.response.headers =
-        "content-type":
-          value: "text/html"
 
     afterEach () ->
       htmlStub.prettyPrint.restore()
-      transaction.response.headers =
-        "content-type":
-          value: "application/json"
 
     it 'should prettify the html for reporting', (done) ->
       executeTransaction transaction, () ->
         assert.ok htmlStub.prettyPrint.called
         done()
 
-
   describe 'when dry run', () ->
-    before () ->
+    beforeEach () ->
+      transaction['configuration'].reporter = new CliReporter()
       transaction['configuration']['options'] = {'dry-run' : true}
       server = nock('http://localhost:3000').
         post('/machines', {"type":"bulldozer","name":"willy"}).