rebuilt

Author: fehguy

browser/swagger-client.js

@@ -28,7 +28,7 @@ Resolver.prototype.processAllOf = function(name, definition, resolutionTable, un
     location = '/definitions/' + name + '/allOf';
     this.resolveInline(null, spec, property, resolutionTable, unresolvedRefs, location);
   }
-}
+};
 
 Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
   var root = arg1, callback = arg2, scope = arg3, location, i;
@@ -115,6 +115,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
   // if the root is same as obj[i].root we can resolve locally
   var all = resolutionTable;
 
+  var parts;
   for(i = 0; i < all.length; i++) {
     var a = all[i];
     if(root === a.root) {
@@ -145,7 +146,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
           toResolve.push(a);
         }
         else {
-          var parts = a.key.split('#');
+          parts = a.key.split('#');
           if(parts.length === 2) {
             if(parts[0].indexOf('http://') === 0 || parts[0].indexOf('https://') === 0) {
               a.root = parts[0];
@@ -175,11 +176,11 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
       }
       else {
         if (a.resolveAs === 'inline') {
-          if(a.key && a.key.indexOf('#') == -1 && a.key.charAt(0) !== '/') {
+          if(a.key && a.key.indexOf('#') === -1 && a.key.charAt(0) !== '/') {
             // handle relative schema
-            var parts = a.root.split('/');
-            var location = '';
-            for(var i = 0; i < parts.length - 1; i++) {
+            parts = a.root.split('/');
+            location = '';
+            for(i = 0; i < parts.length - 1; i++) {
               location += parts[i] + '/';
             }
             location += a.key;

browser/swagger-client.min.js

@@ -23,7 +23,7 @@ module.exports.schemaToJSON = schemaToJSON;
 
 function optionHtml(label, value) {
   return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
-};
+}
 
 function typeFromJsonSchema(type, format) {
   var str;
@@ -182,7 +182,7 @@ function schemaToJSON(schema, models, modelsToIgnore, modelPropertyMacro) {
   }
 
   return output;
-};
+}
 
 function schemaToHTML(name, schema, models, modelPropertyMacro) {
 
@@ -229,7 +229,7 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
   if(typeof modelPropertyMacro !== 'function') {
     modelPropertyMacro = function(prop){
       return (prop || {}).default;
-    }
+    };
   }
 
   var references = {};
@@ -279,7 +279,7 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
     }
 
     return modelName;
-  };
+  }
 
   function primitiveToHTML(schema) {
     var html = '<span class="propType">';
@@ -321,7 +321,8 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
     html += '</span>';
 
     return html;
-  };
+  }
+
   function primitiveToOptionsHTML(schema, html) {
     var options = '';
     var type = schema.type || 'object';
@@ -415,7 +416,8 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
     }
 
     return html;
-  };
+  }
+
   function processModel(schema, name) {
     var type = schema.type || 'object';
     var isArray = schema.type === 'array';
@@ -520,6 +522,5 @@ function schemaToHTML(name, schema, models, modelPropertyMacro) {
     }
 
     return html + strongOpen + (isArray ? ']' : '}') + strongClose;
-  };
-
-};
+  }
+}

lib/resolver.js

@@ -138,7 +138,7 @@ describe('2.0 authorizations', function () {
   });
 
   it('does not apply api-key headers when the value has been manually added', function () {
-    var params = { api_key: 'foo' };
+    var params = { 'api_key': 'foo' };
 
     var parameters = [
       {
@@ -148,11 +148,11 @@ describe('2.0 authorizations', function () {
       }
     ];
     var authorizations = new auth.SwaggerAuthorizations();
-    authorizations.add("Basic", new auth.ApiKeyAuthorization('api_key', 'bar', 'header'));
+    authorizations.add('Basic', new auth.ApiKeyAuthorization('api_key', 'bar', 'header'));
     var op = new Operation({}, 'http', 'test', 'get', '/path', { parameters: parameters },
                                    {}, {}, authorizations);
     var req = op.execute(params, {mock : true});
-    expect(req.headers.api_key).to.equal('foo');
+    expect(req.headers['api_key']).to.equal('foo');
   });
 
   it('does not apply password auth when the value has been manually added', function () {
@@ -166,7 +166,7 @@ describe('2.0 authorizations', function () {
       }
     ];
     var authorizations = new auth.SwaggerAuthorizations();
-    authorizations.add("Basic", new auth.PasswordAuthorization('bar', 'baz'));
+    authorizations.add('Basic', new auth.PasswordAuthorization('bar', 'baz'));
     var op = new Operation({}, 'http', 'test', 'get', '/path', { parameters: parameters },
                                    {}, {}, authorizations);
     var req = op.execute(params, {mock : true});