kick off response data test

coderoshi · coderoshi · commit ebd4c6fc817a · 2013-01-04T08:33:55.000-08:00
diff --git a/lib/requestData.iced b/lib/requestData.iced
@@ -45,9 +45,7 @@ class ReqData
 
   # -> mochiheaders() The incoming HTTP headers. Generally, getReqHeader is more useful.
   # TODO: downcase?
-  reqHeaders: ()->
-    # console.log @req.headers
-    @req.headers
+  reqHeaders: ()-> @req.headers
 
   # TODO: it'd be nice to make this blocking. but, whatever
   # -> 'undefined', binary() The incoming request body, if any.
diff --git a/lib/responseData.iced b/lib/responseData.iced
@@ -6,12 +6,6 @@ class ResData
     @headers = {}
     @body = null
 
-  # isRedirect: ()-> 
-
-  appendToResponseBody: (body)->
-    @body = "" if @body == null
-    @body += body
-
   # -> string()  Look up the current value of an outgoing request header.
   getRespHeader: (string)->
     # @res.getHeader(string)
@@ -43,27 +37,32 @@ class ResData
     @headers[string] = value
 
   # rd()  Append the given value to the body of the outgoing response.
-  appendToResponseBody: (binary) -> 
+  appendToResponseBody: (body) -> 
+    @body = "" if @body == null
+    @body += body
 
   # rd()  see respRedirect; this sets that value.
   doRedirect: (bool) -> @redirect = bool
 
-  # rd()  The dispPath is the only path that can be changed during a request. This function will do so.
+  # rd()  The dispPath is the only path that can be changed during a request.
+  # This function will do so.
   setDispPath: (string) ->
 
   # rd() Replace the incoming request body with this for the rest of the processing.
   setReqBody: (binary) ->
 
   # rd()  Set the outgoing response body to this value.
-  setRespBody: (binary) ->
+  setRespBody: (body) -> @body = body
 
-  # rd()  Use this streamed body to produce the outgoing response body on demand.
-  setRespBody: (streambody) ->
+  # # rd()  Use this streamed body to produce the outgoing response body on demand.
+  # setRespBody: (streambody) ->
 
   # rd()  Given a list of two-tuples of {headername,value}, set those outgoing response headers.
   setRespHeaders: (headername, value) -> 
+    @headers[headername] = value
 
   # rd() Remove the named outgoing response header.
   removeRespHeader: (string) ->
+    delete @headers[headername]
 
 module.exports = ResData
diff --git a/test/fsm-test.js b/test/fsm-test.js
@@ -90,7 +90,7 @@ function buildTest(test) {
       assert.notEqual(req, undefined, 'req is required');
       // TODO: Use path
       // TODO: Check headers
-      // assert.equal(res.statusCode(), test.checkStatus);
+      assert.equal(res.statusCode(), test.checkStatus);
       assert.deepEqual(res.trace, test.checkStack);
     }
   };
diff --git a/test/responseData-test.js b/test/responseData-test.js
@@ -0,0 +1,40 @@
+var vows    = require('vows'),
+    assert  = require('assert'),
+    net     = require('net'),
+    http    = require('http'),
+    iced    = require('iced-coffee-script'),
+    ResData = require('../lib/responseData');
+
+vows.describe('Server').addBatch({
+  'create a valid ResData': {
+    topic: function () {
+      nodeRes = {
+        statusCode: 200,
+      };
+      resData = new ResData(nodeRes);
+      resData.setRespHeader('Location', '/tmp');
+      resData.setRespBody('data');
+      resData.doRedirect(true);
+      this.callback(undefined, resData);
+    },
+    'and fields exist': function (err, resData) {
+      assert.equal(err, undefined);
+      assert(resData.headers);
+      assert(resData.res);
+    },
+    'and respHeaders': function (err, resData) {
+      assert(resData.respHeaders());
+      assert.equal(resData.respHeaders()['Location'], '/tmp');
+    },
+    'and getRespHeader': function (err, resData) {
+      assert.equal(resData.getRespHeader('Location'), '/tmp');
+      assert.equal(resData.getRespHeader('derp'), null);
+    },
+    'and respRedirect': function (err, resData) {
+      assert.equal(resData.respRedirect(), true);
+    },
+    'and statusCode': function (err, resData) {
+      assert.equal(resData.statusCode(), 200);
+    }
+  }
+}).export(module);

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ function buildTest(test) {`
`90`	`90`	`assert.notEqual(req, undefined, 'req is required');`
`91`	`91`	`// TODO: Use path`
`92`	`92`	`// TODO: Check headers`
`93`		`- // assert.equal(res.statusCode(), test.checkStatus);`
	`93`	`+ assert.equal(res.statusCode(), test.checkStatus);`
`94`	`94`	`assert.deepEqual(res.trace, test.checkStack);`
`95`	`95`	`}`
`96`	`96`	`};`