rebuilt

Author: fehguy

browser/swagger-client.js

@@ -249,7 +249,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
             accept: self.scope.swaggerRequestHeaders || 'application/json'
           },
           on: {
-            error: function () {
+            error: function (error) {
               processedCalls += 1;
               unresolvedRefs[item.key] = {
                 root: item.root,
@@ -362,7 +362,7 @@ Resolver.prototype.finish = function (spec, root, resolutionTable, resolvedRefs,
   }
   var existingUnresolved = this.countUnresolvedRefs(spec);
 
-  if(existingUnresolved.length === 0 || this.iteration > 5) {
+  if(existingUnresolved === 0 || this.iteration > 5) {
     this.resolveAllOf(spec.definitions);
     callback.call(this.scope, spec, unresolvedRefs);
   }

browser/swagger-client.min.js

@@ -292,7 +292,7 @@ SwaggerSpecConverter.prototype.responseMessages = function(operation, existingOp
       }
       // Convert responseModel -> schema{$ref: responseModel}
       if(existingResponse.responseModel) {
-        response.schema = {'$ref': existingResponse.responseModel};
+        response.schema = {'$ref': '#/definitions/' + existingResponse.responseModel};
       }
       operation.responses['' + existingResponse.code] = response;
     }

lib/resolver.js

@@ -480,7 +480,7 @@ describe('SwaggerClient', function () {
     });
   });
 
-  it('applies both a request and response interceptor per #601 with promies', function(done) {
+  it('applies both a request and response interceptor per #601 with promises', function(done) {
     var startTime = 0;
     var elapsed = 0;
 

lib/spec-converter.js

@@ -100,7 +100,7 @@ describe('converts specs', function () {
 
         // models
         var definitions = swagger.definitions;
-        expect(Object.keys(definitions).length).toBe(8);
+        expect(Object.keys(definitions).length).toBe(9);
         var pet = definitions.Pet;
         expect(Object.keys(pet.properties).length).toBe(8);
         var photos = pet.properties.photoUrls;
@@ -125,6 +125,7 @@ describe('converts specs', function () {
       var converter = new SwaggerSpecConverter();
       converter.setDocumentationLocation('http://localhost:8001/v1/api-docs');
       converter.convert(data.obj, {}, function(swagger) {
+
         // metadata tests
         expect(swagger.swagger).toBe('2.0');
         test.object(swagger.info);
@@ -279,7 +280,7 @@ describe('converts specs', function () {
       var operation = spec.paths['/responseModels'].get;
       expect(Object.keys(operation.responses).length).toBe(3); // 200 + 400 + default
 
-      expect(operation.responses['200'].schema).toEqual({'$ref': 'Test'});
+      expect(operation.responses['200'].schema).toEqual({'$ref': '#/definitions/Test'});
       expect(operation.responses['404']).toEqual({description: 'You got no Test'});
 
     });
@@ -295,5 +296,36 @@ describe('converts specs', function () {
       expect(model.required).toInclude('one');
 
     });
+
+    it('makes the expected requests', function(done) {
+      var callCount = 0;
+
+      var interceptor = {
+        requestInterceptor: {
+          apply: function (requestObj) {
+            // rewrites an invalid pet id (-100) to be valid (1)
+            // you can do what you want here, like inject headers, etc.
+            callCount += 1
+            return requestObj;
+          }
+        }
+      };
+
+      new SwaggerClient({
+        url: 'http://localhost:8001/v1/api-docs.json',
+        usePromise: true,
+        requestInterceptor: interceptor.requestInterceptor
+      }).then(function(client) {
+        var operation = client.apis.pet.operations.getPetById;
+        expect(operation.successResponse[200].definition).toBeAn('object');
+        expect(operation.responses[400].schema).toBeAn('object');
+        expect(operation.responses[400].schema['$ref']).toBe('#/definitions/VeryBad');
+        expect(callCount).toEqual(1);
+        done();
+      }).catch(function(e) {
+        console.log(e);
+        done(e);
+      });
+    });
   });
 });

test/client.js

@@ -110,7 +110,8 @@
           "responseMessages": [
             {
               "code": 400,
-              "message": "Invalid ID supplied"
+              "message": "Invalid ID supplied",
+              "responseModel": "VeryBad"
             },
             {
               "code": 404,
@@ -554,6 +555,13 @@
           "$ref": "Phone"
         }
       }
+    },
+    "VeryBad": {
+      "properties": {
+        "message": {
+          "type": "string"
+        }
+      }
     }
   }
 }