Merge pull request #52 from jolson88/master

Upgrade Sway dependency to 1.0.0 release
apigee-127 · Aug 7, 2016 · 56cbdc0 · 56cbdc0
2 parents 20f123d + efce7b8
commit 56cbdc0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/fittings/swagger_router.js b/fittings/swagger_router.js
@@ -81,12 +81,12 @@ module.exports = function create(fittingDef, bagpipes) {
       var statusCode = parseInt(context.request.get('_mockreturnstatus')) || 200;
 
       var mimetype = context.request.get('accept') || 'application/json';
-      var mock = operation.getResponseExample(statusCode, mimetype);
+      var mock = operation.getResponse(statusCode).getExample(mimetype);
 
       if (mock) {
         debug('returning mock example value', mock);
       } else {
-        mock = operation.getResponseSample(statusCode);
+        mock = operation.getResponse(statusCode).getSample();
         debug('returning mock sample value', mock);
       }
 

diff --git a/lib/connect_middleware.js b/lib/connect_middleware.js
@@ -160,7 +160,11 @@ function hookResponseForValidation(context, eventEmitter) {
         var headers = res._headers || res.headers || {};
         var body = data || written;
         debugContent('response body type: %s value: %s', typeof body, body);
-        var validateResult = context.request.swagger.operation.validateResponse(res.statusCode, headers, body);
+        var validateResult = context.request.swagger.operation.validateResponse({
+          statusCode: res.statusCode,
+          headers: headers,
+          body: body
+        });
         debug('validation result:', validateResult);
         if (validateResult.errors.length || validateResult.warnings.length) {
           debug('emitting responseValidationError');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-node-runner",
-  "version": "0.6.16",
+  "version": "0.7.0",
   "description": "Swagger loader and middleware utilities",
   "keywords": [
     "swagger",
@@ -31,7 +31,7 @@
     "multer": "^1.0.6",
     "parseurl": "^1.3.0",
     "qs": "^5.2.0",
-    "sway": "^0.6.0",
+    "sway": "^1.0.0",
     "type-is": "^1.6.9"
   },
   "devDependencies": {

diff --git a/test/lib/common.js b/test/lib/common.js
@@ -453,7 +453,7 @@ module.exports = function() {
         should.exist(res);
         validationResponse.errors.should.be.an.Array;
         validationResponse.errors.length.should.eql(1);
-        validationResponse.errors[0].should.eql({
+        validationResponse.errors[0].should.containDeep({
           code: 'INVALID_RESPONSE_HEADER',
           errors:
           [ { code: 'INVALID_TYPE',
@@ -484,7 +484,7 @@ module.exports = function() {
         should.exist(res);
         validationResponse.errors.should.be.an.Array;
         validationResponse.errors.length.should.eql(1);
-        validationResponse.errors[0].should.eql({
+        validationResponse.errors[0].should.containDeep({
           code: 'INVALID_RESPONSE_BODY',
           errors:
             [ { code: 'INVALID_TYPE',