allow non-object responses. Fixes #9

mac- · Sep 21, 2014 · 4662432 · 4662432
1 parent ccba8f0
commit 4662432
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/lib/RouteSchemaManager.js b/lib/RouteSchemaManager.js
@@ -264,9 +264,6 @@ var RouteSchemaManager = function(options) {
 			return { valid: true };
 		}
 
-		if (typeof(request.response.source) !== 'object') {
-			return { valid: false, errors: ['response is not an object'] };
-		}
 		var report = {
 			valid: validator.validate(request.response.source, schemas[validationTypes.RESPONSE])
 		};

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "contributors": [
     "Mac Angell <mac.ang311@gmail.com>"
   ],
-  "version": "0.6.0",
+  "version": "0.6.1",
   "dependencies": {
     "underscore": "1.x.x",
     "hoek": "2.x.x",

diff --git a/test/RouteSchemaManager.tests.js b/test/RouteSchemaManager.tests.js
@@ -102,7 +102,25 @@ var assert = require('assert'),
 			}
 		}
 	},
-	mockRoutes = [mockRoute1, mockRoute2];
+	mockRoute4 = {
+		method: 'POST',
+		path: '/good/fnord/{string}/{number}',
+		server: {
+			info: {
+				uri: 'http://fnord.com'
+			}
+		},
+		settings: {
+			plugins: {
+				ratify: {
+					response: {
+						schema: stringSchema
+					}
+				}
+			}
+		}
+	},
+	mockRoutes = [mockRoute1, mockRoute2, mockRoute4];
 
 describe('RouteSchemaManager Unit Tests', function() {
 
@@ -590,48 +608,48 @@ describe('RouteSchemaManager Unit Tests', function() {
 			assert(report.valid, 'response obj should be valid');
 		});
 
-		it('should validate response for route with no response schema successfully', function() {
+		it('should validate a string response for route successfully', function() {
 
 			var routeSchemaManager = new RouteSchemaManager(rsmConfig),
 				mockRequest = {
-					_route: mockRoute2,
+					_route: mockRoute4,
 					response: {
-						source: {string:'fnord'}
+						source: 'fnord'
 					}
 				};
 			routeSchemaManager.initializeRoutes(mockRoute1.server.info.uri, mockRoutes);
 			var report = routeSchemaManager.validateResponse(mockRequest);
-			assert(report.valid, 'response obj should be valid');
+			assert(report.valid, 'response string should be valid');
 		});
 
-		it('should fail validation of response', function() {
+		it('should validate response for route with no response schema successfully', function() {
 
 			var routeSchemaManager = new RouteSchemaManager(rsmConfig),
 				mockRequest = {
-					_route: mockRoute1,
+					_route: mockRoute2,
 					response: {
-						source: {string:true}
+						source: {string:'fnord'}
 					}
 				};
 			routeSchemaManager.initializeRoutes(mockRoute1.server.info.uri, mockRoutes);
 			var report = routeSchemaManager.validateResponse(mockRequest);
-			assert(!report.valid, 'response obj should not be valid');
-			assert(report.errors, 'errors obj should be valid');
+			assert(report.valid, 'response obj should be valid');
 		});
 
-		it('should fail validation of response when response is non-object', function() {
+		it('should fail validation of response', function() {
 
 			var routeSchemaManager = new RouteSchemaManager(rsmConfig),
 				mockRequest = {
 					_route: mockRoute1,
 					response: {
-						source: 'fnord'
+						source: {string:true}
 					}
 				};
 			routeSchemaManager.initializeRoutes(mockRoute1.server.info.uri, mockRoutes);
 			var report = routeSchemaManager.validateResponse(mockRequest);
 			assert(!report.valid, 'response obj should not be valid');
 			assert(report.errors, 'errors obj should be valid');
 		});
+
 	});
 });