",
"description": "swagger.js is a javascript client for use with swaggering APIs.",
- "version": "2.1.2-M1",
+ "version": "2.1.3-M1",
"homepage": "http://swagger.io",
"repository": {
"type": "git",
diff --git a/src/js/auth.js b/src/js/auth.js
index e5945a4e9..5454c54e0 100644
--- a/src/js/auth.js
+++ b/src/js/auth.js
@@ -17,10 +17,10 @@ SwaggerAuthorizations.prototype.remove = function(name) {
SwaggerAuthorizations.prototype.apply = function (obj, authorizations) {
var status = null;
- var key, value, result;
+ var key, name, value, result;
// if the "authorizations" key is undefined, or has an empty array, add all keys
- if (typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
+ if (typeof authorizations === 'undefined' || Object.keys(authorizations).length === 0) {
for (key in this.authz) {
value = this.authz[key];
result = value.apply(obj, authorizations);
diff --git a/src/js/swagger-a.js b/src/js/swagger-a.js
index 8e9455091..4426ca533 100644
--- a/src/js/swagger-a.js
+++ b/src/js/swagger-a.js
@@ -1,3 +1,7 @@
+var addModel = function(name, model) {
+ models[name] = model;
+};
+
var SwaggerClient = function(url, options) {
this.isBuilt = false;
this.url = null;
@@ -9,13 +13,14 @@ var SwaggerClient = function(url, options) {
this.isValid = false;
this.info = null;
this.useJQuery = false;
+ this.resourceCount = 0;
if(typeof url !== 'undefined')
return this.initialize(url, options);
};
SwaggerClient.prototype.initialize = function (url, options) {
- this.models = models;
+ this.models = models = {};
options = (options||{});
@@ -104,7 +109,6 @@ SwaggerClient.prototype.build = function(mock) {
return obj;
new SwaggerHttp().execute(obj);
}
-
return this;
};
@@ -220,8 +224,11 @@ SwaggerClient.prototype.buildFromSpec = function(response) {
}
}
this.isBuilt = true;
- if (this.success)
+ if (this.success) {
+ this.isValid = true;
+ this.isBuilt = true;
this.success();
+ }
return this;
};
@@ -310,18 +317,18 @@ var Operation = function(parent, scheme, operationId, httpMethod, path, args, de
}
}
+ var i, model;
+
if(definitions) {
// add to global models
var key;
for(key in this.definitions) {
- var model = new Model(key, definitions[key]);
+ model = new Model(key, definitions[key]);
if(model) {
models[key] = model;
}
}
}
-
- var i;
for(i = 0; i < this.parameters.length; i++) {
var param = this.parameters[i];
if(param.type === 'array') {
@@ -359,7 +366,7 @@ var Operation = function(parent, scheme, operationId, httpMethod, path, args, de
param.responseClassSignature = param.signature;
}
- var defaultResponseCode, response, model, responses = this.responses;
+ var defaultResponseCode, response, responses = this.responses;
if(responses['200']) {
response = responses['200'];
@@ -713,9 +720,9 @@ Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
var allHeaders = this.getHeaderParams(args);
var contentTypeHeaders = this.setContentTypes(args, opts);
- var headers = {};
- for (var attrname in allHeaders) { headers[attrname] = allHeaders[attrname]; }
- for (var attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }
+ var headers = {}, attrname;
+ for (attrname in allHeaders) { headers[attrname] = allHeaders[attrname]; }
+ for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }
var body = this.getBody(headers, args);
var url = this.urlify(args);
@@ -1157,7 +1164,7 @@ Property.prototype.toString = function() {
type = '';
}
else {
- this.schema.type;
+ type = this.schema.type;
}
if (this.default)
@@ -1218,7 +1225,7 @@ Property.prototype.toString = function() {
optionHtml = function(label, value) {
return '| ' + label + ': | ' + value + ' |
';
-}
+};
typeFromJsonSchema = function(type, format) {
var str;
diff --git a/src/js/swagger-compat.js b/src/js/swagger-compat.js
index 651e77dd8..1045f1538 100644
--- a/src/js/swagger-compat.js
+++ b/src/js/swagger-compat.js
@@ -1,5 +1,5 @@
SwaggerClient.prototype.buildFrom1_2Spec = function (response) {
- if (response.apiVersion != null) {
+ if (response.apiVersion !== null) {
this.apiVersion = response.apiVersion;
}
this.apis = {};
@@ -35,6 +35,7 @@ SwaggerClient.prototype.buildFrom1_2Spec = function (response) {
this.apisArray.push(res);
} else {
var k;
+ this.expectedResourceCount = response.apis.length;
for (k = 0; k < response.apis.length; k++) {
var resource = response.apis[k];
res = new SwaggerResource(resource, this);
@@ -43,15 +44,21 @@ SwaggerClient.prototype.buildFrom1_2Spec = function (response) {
}
}
this.isValid = true;
+ return this;
+};
+
+SwaggerClient.prototype.finish = function() {
if (typeof this.success === 'function') {
+ this.isValid = true;
+ this.isBuilt = true;
+ this.selfReflect();
this.success();
- }
- return this;
+ }
};
SwaggerClient.prototype.buildFrom1_1Spec = function (response) {
log('This API is using a deprecated version of Swagger! Please see http://github.com/wordnik/swagger-core/wiki for more info');
- if (response.apiVersion != null)
+ if (response.apiVersion !== null)
this.apiVersion = response.apiVersion;
this.apis = {};
this.apisArray = [];
@@ -97,7 +104,7 @@ SwaggerClient.prototype.buildFrom1_1Spec = function (response) {
SwaggerClient.prototype.convertInfo = function (resp) {
if(typeof resp == 'object') {
- var info = {}
+ var info = {};
info.title = resp.title;
info.description = resp.description;
@@ -126,9 +133,6 @@ SwaggerClient.prototype.selfReflect = function () {
}
this.setConsolidatedModels();
this.ready = true;
- if (typeof this.success === 'function') {
- return this.success();
- }
};
SwaggerClient.prototype.setConsolidatedModels = function () {
@@ -168,7 +172,7 @@ var SwaggerResource = function (resourceObj, api) {
this.operations = {};
this.operationsArray = [];
this.modelsArray = [];
- this.models = {};
+ this.models = api.models || {};
this.rawModels = {};
this.useJQuery = (typeof api.useJQuery !== 'undefined') ? api.useJQuery : null;
@@ -194,9 +198,11 @@ var SwaggerResource = function (resourceObj, api) {
on: {
response: function (resp) {
var responseObj = resp.obj || JSON.parse(resp.data);
+ _this.api.resourceCount += 1;
return _this.addApiDeclaration(responseObj);
},
error: function (response) {
+ _this.api.resourceCount += 1;
return _this.api.fail('Unable to read api \'' +
_this.name + '\' from path ' + _this.url + ' (server returned ' + response.statusText + ')');
}
@@ -250,7 +256,9 @@ SwaggerResource.prototype.addApiDeclaration = function (response) {
}
this.api[this.name] = this;
this.ready = true;
- return this.api.selfReflect();
+ if(this.api.resourceCount === this.api.expectedResourceCount)
+ this.api.finish();
+ return this;
};
SwaggerResource.prototype.addModels = function (models) {
@@ -543,7 +551,7 @@ var SwaggerOperation = function (nickname, path, method, parameters, summary, no
this.path = this.path.replace('{format}', 'json');
this.method = this.method.toLowerCase();
- this.isGetMethod = this.method === 'GET';
+ this.isGetMethod = this.method === 'get';
var i, j, v;
this.resourceName = this.resource.name;
@@ -594,17 +602,17 @@ var SwaggerOperation = function (nickname, path, method, parameters, summary, no
}
}
}
- else if (param.allowableValues != null) {
+ else if (param.allowableValues) {
if (param.allowableValues.valueType === 'RANGE')
param.isRange = true;
else
param.isList = true;
- if (param.allowableValues != null) {
+ if (param.allowableValues) {
param.allowableValues.descriptiveValues = [];
if (param.allowableValues.values) {
for (j = 0; j < param.allowableValues.values.length; j++) {
v = param.allowableValues.values[j];
- if (param.defaultValue != null) {
+ if (param.defaultValue !== null) {
param.allowableValues.descriptiveValues.push({
value: String(v),
isDefault: (v === param.defaultValue)
@@ -674,7 +682,7 @@ SwaggerOperation.prototype.getSampleJSON = function (type, models) {
var isPrimitive, listType, val;
listType = this.isListType(type);
isPrimitive = ((typeof listType !== 'undefined') && models[listType]) || (typeof models[type] !== 'undefined') ? false : true;
- val = isPrimitive ? void 0 : (listType != null ? models[listType].createJSONSample() : models[type].createJSONSample());
+ val = isPrimitive ? void 0 : (listType ? models[listType].createJSONSample() : models[type].createJSONSample());
if (val) {
val = listType ? [val] : val;
if (typeof val == 'string')
@@ -709,7 +717,7 @@ SwaggerOperation.prototype['do'] = function (args, opts, callback, error) {
callback = function (response) {
var content;
content = null;
- if (response != null) {
+ if (response !== null) {
content = response.data;
} else {
content = 'no data';
@@ -720,7 +728,7 @@ SwaggerOperation.prototype['do'] = function (args, opts, callback, error) {
params = {};
params.headers = [];
- if (args.headers != null) {
+ if (args.headers) {
params.headers = args.headers;
delete args.headers;
}
@@ -841,7 +849,7 @@ SwaggerOperation.prototype.urlify = function (args) {
}
}
}
- if ((queryParams != null) && queryParams.length > 0)
+ if ((queryParams) && queryParams.length > 0)
url += '?' + queryParams;
return url;
};
@@ -1050,7 +1058,7 @@ var SwaggerRequest = function (type, url, params, opts, successCallback, errorCa
}
var obj;
- if (!((this.headers != null) && (this.headers.mock != null))) {
+ if (!((this.headers) && (this.headers.mock))) {
obj = {
url: this.url,
method: this.type,
diff --git a/src/js/zexports.js b/src/js/zexports.js
index 84e3d7352..c2ec0e772 100644
--- a/src/js/zexports.js
+++ b/src/js/zexports.js
@@ -6,6 +6,7 @@ e.ApiKeyAuthorization = ApiKeyAuthorization;
e.PasswordAuthorization = PasswordAuthorization;
e.CookieAuthorization = CookieAuthorization;
e.SwaggerClient = SwaggerClient;
+e.SwaggerApi = SwaggerClient;
e.Operation = Operation;
e.Model = Model;
-e.models = models;
\ No newline at end of file
+e.addModel = addModel;
diff --git a/test/auth.js b/test/auth.js
index 1b7bd9af6..099f58035 100644
--- a/test/auth.js
+++ b/test/auth.js
@@ -14,7 +14,6 @@ describe('2.0 authorizations', function() {
after(function(done){
instance.close();
-
swagger.authorizations.authz = {};
done();
});
@@ -50,7 +49,7 @@ describe('2.0 authorizations', function() {
var req = petApi.getPetById(params, opts);
expect(req.url).toBe('http://localhost:8000/v2/api/pet/1');
- expect(req.headers['api_key']).toBe('abc123');
+ expect(req.headers.api_key).toBe('abc123');
swagger.authorizations.authz = {};
});
diff --git a/test/compat/auth.js b/test/compat/auth.js
index 55066bb5e..dbef5b2fa 100644
--- a/test/compat/auth.js
+++ b/test/compat/auth.js
@@ -1,10 +1,10 @@
-var test = require('unit.js')
-var expect = require('expect')
+var test = require('unit.js');
+var expect = require('expect');
var mock = require('../../test/compat/mock');
var swagger = require('../../lib/swagger-client');
var sample, instance;
-describe('api key authorizations', function() {
+describe('1.2 api key authorizations', function() {
before(function(done) {
mock.petstore(done, function(petstore, server){
sample = petstore;
@@ -51,7 +51,7 @@ describe('api key authorizations', function() {
var req = petApi.getPetById(params, opts);
expect(req.url).toBe('http://localhost:8000/v1/api/pet/1');
- expect(req.headers['api_key']).toBe('abc123');
+ expect(req.headers.api_key).toBe('abc123');
swagger.authorizations.authz = {};
});
diff --git a/test/compat/defaultCallbacks.js b/test/compat/defaultCallbacks.js
index 723f76f3e..eac0b25f7 100644
--- a/test/compat/defaultCallbacks.js
+++ b/test/compat/defaultCallbacks.js
@@ -4,7 +4,7 @@ var mock = require('../../test/compat/mock');
var swagger = require('../../lib/swagger-client');
var sample, instance;
-describe('default success callback', function() {
+describe('1.2 default success callback', function() {
var opts = {};
var finished;
opts.defaultSuccessCallback = function(data) {
diff --git a/test/compat/http.js b/test/compat/http.js
index 02e9d95b8..b72f95f25 100644
--- a/test/compat/http.js
+++ b/test/compat/http.js
@@ -3,7 +3,7 @@ var expect = require('expect');
var mock = require('../../test/compat/mock');
var sample, instance;
-describe('http', function() {
+describe('1.2 http', function() {
before(function(done) {
mock.petstore(done, function(petstore, server){
sample = petstore;
@@ -62,10 +62,10 @@ describe('http', function() {
var petApi = sample.pet;
var success = function(data) {
done();
- }
+ };
var failure = function(data) {
done();
- }
+ };
var req = petApi.getPetById({petId: 0}, {responseContentType: 'invalid'}, success, failure);
});
@@ -73,10 +73,10 @@ describe('http', function() {
var petApi = sample.pet;
var success = function(data) {
fail();
- }
+ };
var failure = function(data) {
done();
- }
+ };
var req = petApi.getPetById({petId: 0}, success, failure);
});
});
diff --git a/test/compat/macros.js b/test/compat/macros.js
index 97c141e57..8614bc103 100644
--- a/test/compat/macros.js
+++ b/test/compat/macros.js
@@ -3,7 +3,7 @@ var expect = require('expect');
var mock = require('../../test/compat/mock');
var sample, instance;
-describe('macro overrides', function() {
+describe('1.2 macro overrides', function() {
before(function(done) {
var macros = {
parameter: function(operation, parameter) {
@@ -15,7 +15,7 @@ describe('macro overrides', function() {
modelProperty: function(model, property) {
return property.defaultValue;
}
- }
+ };
mock.petstore(done, function(petstore, server){
sample = petstore;
instance = server;
diff --git a/test/compat/mock.js b/test/compat/mock.js
index 9a053351a..e2131b3f8 100644
--- a/test/compat/mock.js
+++ b/test/compat/mock.js
@@ -8,9 +8,9 @@ var sample;
exports.swagger = swagger;
exports.petstore = function(arg1, arg2, arg3, arg4) {
- var done = arg1, opts = arg2, callback = arg3, macros = arg4;
+ var done = arg1, opts = arg2 || {}, callback = arg3, macros = arg4;
if(typeof arg2 === 'function') {
- opts = null;
+ opts = {};
callback = arg2;
macros = arg3;
}
@@ -28,7 +28,7 @@ exports.petstore = function(arg1, arg2, arg3, arg4) {
else {
fs.exists(filename, function(exists) {
if(exists) {
- var accept = req.headers['accept'];
+ var accept = req.headers.accept;
if(typeof accept !== 'undefined') {
if(accept === 'invalid') {
res.writeHead(500);
@@ -59,8 +59,6 @@ exports.petstore = function(arg1, arg2, arg3, arg4) {
}).listen(8000);
instance.on("listening", function() {
- var self = {}; self.stop = done;
-
if(macros) {
if(macros.parameter) {
console.log(' warn: set parameter macro');
@@ -71,17 +69,12 @@ exports.petstore = function(arg1, arg2, arg3, arg4) {
swagger.modelPropertyMacro = macros.modelProperty;
}
}
- var sample = new swagger.SwaggerClient('http://localhost:8000/v1/api-docs.json', opts);
- sample.build();
- var count = 0, isDone = false;
- var f = function () {
- if(!isDone) {
- isDone = true;
- self.stop();
- }
+ opts.success = function() {
+ done();
callback(sample, instance);
return;
};
- setTimeout(f, 50);
+ opts.url = 'http://localhost:8000/v1/api-docs.json';
+ var sample = new swagger.SwaggerClient(opts);
});
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/test/compat/modelSignatures.js b/test/compat/modelSignatures.js
index 4c1dd2ac8..d7ba6c356 100644
--- a/test/compat/modelSignatures.js
+++ b/test/compat/modelSignatures.js
@@ -1,9 +1,9 @@
-var test = require('unit.js')
-var expect = require('expect')
+var test = require('unit.js');
+var expect = require('expect');
var mock = require('../../test/compat/mock');
var sample, instance;
-describe('model signatures', function() {
+describe('1.2 model signatures', function() {
before(function(done) {
mock.petstore(done, function(petstore, server){
sample = petstore;
@@ -17,7 +17,7 @@ describe('model signatures', function() {
});
it('returns the json representation of a pet with repeating models', function() {
- var pet = sample.models['Animals'];
+ var pet = sample.models.Animals;
test.object(pet);
// verify that each instance of `Pet` is represented
@@ -29,5 +29,5 @@ describe('model signatures', function() {
model += '"mouse":' + petModel + '}';
expect(JSON.stringify(pet.createJSONSample())).toBe(model);
- })
+ });
});
diff --git a/test/compat/models.js b/test/compat/models.js
index 37206b46d..d527eb5a5 100644
--- a/test/compat/models.js
+++ b/test/compat/models.js
@@ -4,7 +4,7 @@ var mock = require('../../test/compat/mock');
var swagger = require('../../lib/swagger-client');
var sample, instance;
-describe('get model operations', function() {
+describe('1.2 get model operations', function() {
before(function(done) {
mock.petstore(done, function(petstore, server){
sample = petstore;
@@ -19,29 +19,29 @@ describe('get model operations', function() {
});
it('verifies the Pet model', function(done) {
- var pet = sample.pet.models['Pet'];
+ var pet = sample.pet.models.Pet;
expect(pet.name).toBe('Pet');
var props = pet.properties;
expect(props[0].name).toBe('id');
expect(props[0].dataType).toBe('integer');
- expect(props[1].name).toBe('category')
- expect(props[1].dataType).toBe('Category')
+ expect(props[1].name).toBe('category');
+ expect(props[1].dataType).toBe('Category');
- expect(props[2].name).toBe('name')
- expect(props[2].dataType).toBe('string')
+ expect(props[2].name).toBe('name');
+ expect(props[2].dataType).toBe('string');
- expect(props[3].name).toBe('photoUrls')
- expect(props[3].dataType).toBe('array')
- expect(props[3].refDataType).toBe('string')
+ expect(props[3].name).toBe('photoUrls');
+ expect(props[3].dataType).toBe('array');
+ expect(props[3].refDataType).toBe('string');
- expect(props[4].name).toBe('tags')
- expect(props[4].dataType).toBe('array')
- expect(props[4].refDataType).toBe('Tag')
+ expect(props[4].name).toBe('tags');
+ expect(props[4].dataType).toBe('array');
+ expect(props[4].refDataType).toBe('Tag');
- expect(props[5].name).toBe('status')
- expect(props[5].dataType).toBe('string')
+ expect(props[5].name).toBe('status');
+ expect(props[5].dataType).toBe('string');
done();
});
@@ -59,4 +59,4 @@ describe('get model operations', function() {
done();
});
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/test/compat/operation.js b/test/compat/operation.js
index 64167baf8..048ed0d04 100644
--- a/test/compat/operation.js
+++ b/test/compat/operation.js
@@ -1,9 +1,9 @@
-var test = require('unit.js')
-var expect = require('expect')
+var test = require('unit.js');
+var expect = require('expect');
var mock = require('../../test/compat/mock');
var sample, instance;
-describe('verifies the nickname is sanitized', function() {
+describe('1.2 verifies the nickname is sanitized', function() {
before(function(done) {
mock.petstore(done, function(petstore, server){
sample = petstore;
@@ -13,7 +13,6 @@ describe('verifies the nickname is sanitized', function() {
after(function(done){
instance.close();
-
done();
});
@@ -63,7 +62,6 @@ describe('verifies the get pet operation', function() {
after(function(done){
instance.close();
-
done();
});
@@ -81,7 +79,7 @@ describe('verifies the get pet operation', function() {
operation = sample.pet.operations.getPetById;
operation.resource.basePath = 'http://foo.bar/api/';
var url = operation.urlify({petId: 129298});
- expect(url).toBe('http://foo.bar/api/pet/129298')
+ expect(url).toBe('http://foo.bar/api/pet/129298');
});
it('verifies the default value from the get operation', function() {
@@ -96,7 +94,7 @@ describe('verifies the get pet operation', function() {
});
it('verifies the get pet operation', function() {
- operation = sample.pet.operations.getPetById
+ operation = sample.pet.operations.getPetById;
expect(operation.method).toBe('get');
parameters = operation.parameters;
@@ -104,7 +102,7 @@ describe('verifies the get pet operation', function() {
test.object(parameters);
expect(parameters.length).toBe(1);
- param = parameters[0]
+ param = parameters[0];
expect(param.name).toBe('petId');
expect(param.type).toBe('integer');
expect(param.paramType).toBe('path');
@@ -112,15 +110,15 @@ describe('verifies the get pet operation', function() {
});
it('verifies the post pet operation', function() {
- operation = sample.pet.operations.addPet
+ operation = sample.pet.operations.addPet;
expect(operation.method).toBe('post');
- parameters = operation.parameters
+ parameters = operation.parameters;
test.object(parameters);
expect(parameters.length).toBe(1);
- param = parameters[0]
+ param = parameters[0];
expect(param.name).toBe('body');
expect(param.type).toBe('Pet');
expect(param.paramType).toBe('body');
@@ -128,15 +126,15 @@ describe('verifies the get pet operation', function() {
});
it('verifies the put pet operation', function() {
- operation = sample.pet.operations.updatePet
+ operation = sample.pet.operations.updatePet;
expect(operation.method).toBe('put');
- parameters = operation.parameters
+ parameters = operation.parameters;
test.object(parameters);
expect(parameters.length).toBe(1);
- param = parameters[0]
+ param = parameters[0];
expect(param.name).toBe('body');
expect(param.type).toBe('Pet');
expect(param.paramType).toBe('body');
@@ -144,15 +142,15 @@ describe('verifies the get pet operation', function() {
});
it('verifies the findByTags operation', function() {
- operation = sample.pet.operations.findPetsByTags
+ operation = sample.pet.operations.findPetsByTags;
expect(operation.method).toBe('get');
- parameters = operation.parameters
+ parameters = operation.parameters;
test.object(parameters);
expect(parameters.length).toBe(1);
- param = parameters[0]
+ param = parameters[0];
expect(param.name).toBe('tags');
expect(param.type).toBe('string');
@@ -161,25 +159,25 @@ describe('verifies the get pet operation', function() {
});
it('verifies the patch pet operation', function() {
- operation = sample.pet.operations.partialUpdate
+ operation = sample.pet.operations.partialUpdate;
expect(operation.method).toBe('patch');
- produces = operation.produces
+ produces = operation.produces;
expect(produces.length).toBe(2);
expect(produces[0]).toBe('application/json');
expect(produces[1]).toBe('application/xml');
- parameters = operation.parameters
+ parameters = operation.parameters;
test.object(parameters);
expect(parameters.length).toBe(2);
- param = parameters[0]
+ param = parameters[0];
expect(param.name).toBe('petId');
expect(param.type).toBe('string');
expect(param.paramType).toBe('path');
test.value(param.description);
- param = parameters[1]
+ param = parameters[1];
expect(param.name).toBe('body');
expect(param.type).toBe('Pet');
expect(param.paramType).toBe('body');
@@ -187,31 +185,31 @@ describe('verifies the get pet operation', function() {
});
it('verifies the post pet operation with form', function() {
- operation = sample.pet.operations.updatePetWithForm
+ operation = sample.pet.operations.updatePetWithForm;
expect(operation.method).toBe('post');
- consumes = operation.consumes
+ consumes = operation.consumes;
expect(consumes.length).toBe(1);
expect(consumes[0]).toBe('application/x-www-form-urlencoded');
- parameters = operation.parameters
+ parameters = operation.parameters;
test.object(parameters);
expect(parameters.length).toBe(3);
- param = parameters[0]
+ param = parameters[0];
expect(param.name).toBe('petId');
expect(param.type).toBe('string');
expect(param.paramType).toBe('path');
test.value(param.description);
- param = parameters[1]
+ param = parameters[1];
expect(param.name).toBe('name');
expect(param.type).toBe('string');
expect(param.paramType).toBe('form');
test.value(param.description);
expect(param.required).toBe(false);
- param = parameters[2]
+ param = parameters[2];
expect(param.name).toBe('status');
expect(param.type).toBe('string');
expect(param.paramType).toBe('form');
@@ -220,25 +218,25 @@ describe('verifies the get pet operation', function() {
});
it('verifies a file upload', function() {
- var operation = sample.pet.operations.uploadFile
+ var operation = sample.pet.operations.uploadFile;
expect(operation.method).toBe('post');
- var consumes = operation.consumes
+ var consumes = operation.consumes;
expect(consumes.length).toBe(1);
expect(consumes[0]).toBe('multipart/form-data');
- var parameters = operation.parameters
+ var parameters = operation.parameters;
test.object(parameters);
expect(parameters.length).toBe(2);
- var param = parameters[0]
+ var param = parameters[0];
expect(param.name).toBe('additionalMetadata');
expect(param.type).toBe('string');
expect(param.paramType).toBe('form');
expect(param.required).toBe(false);
test.value(param.description);
- param = parameters[1]
+ param = parameters[1];
expect(param.name).toBe('file');
expect(param.type).toBe('File');
expect(param.paramType).toBe('body');
@@ -252,12 +250,12 @@ describe('verifies the get pet operation', function() {
});
it('gets operations for the pet api', function() {
- var ops = sample.pet.operations
+ var ops = sample.pet.operations;
test.object(ops);
});
it('gets help() from the file upload operation', function() {
- operation = sample.pet.operations.uploadFile
+ operation = sample.pet.operations.uploadFile;
expect(operation.help()).toBe('* additionalMetadata - Additional data to pass to server\n* file - file to upload');
});
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/test/compat/request.js b/test/compat/request.js
index 7728ad21a..ba23dbf63 100644
--- a/test/compat/request.js
+++ b/test/compat/request.js
@@ -1,10 +1,10 @@
-var test = require('unit.js')
-var expect = require('expect')
+var test = require('unit.js');
+var expect = require('expect');
var mock = require('../../test/compat/mock');
var swagger = require('../../lib/swagger-client');
var sample, instance;
-describe('request operations', function() {
+describe('1.2 request operations', function() {
before(function(done) {
mock.petstore(done, function(petstore, server){
sample = petstore;
@@ -14,7 +14,6 @@ describe('request operations', function() {
after(function(done){
instance.close();
-
done();
});
@@ -38,7 +37,7 @@ describe('request operations', function() {
test.object(req);
expect(req.method).toBe('GET');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
expect(req.url).toBe('http://localhost:8000/v1/api/pet/1');
});
@@ -59,7 +58,7 @@ describe('request operations', function() {
var req = petApi.findPetsByStatus(params, opts);
expect(req.method).toBe("GET");
- expect(req.headers["Accept"]).toBe("application/json");
+ expect(req.headers.Accept).toBe("application/json");
expect(req.url).toBe("http://localhost:8000/v1/api/pet/findByStatus?status=available");
});
@@ -78,7 +77,7 @@ describe('request operations', function() {
var req = petApi.addPet(params, opts);
expect(req.method).toBe("POST");
- expect(req.headers["Accept"]).toBe("application/json");
+ expect(req.headers.Accept).toBe("application/json");
expect(req.headers["Content-Type"]).toBe("application/json");
expect(req.body).toBe('{"id":100,"name":"monster","status":"dead"}');
expect(req.url).toBe("http://localhost:8000/v1/api/pet");
@@ -97,7 +96,7 @@ describe('request operations', function() {
var req = petApi.updatePetWithForm(params, opts);
expect(req.method).toBe('POST');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
expect(req.headers['Content-Type']).toBe('application/x-www-form-urlencoded');
expect(req.body).toBe('name=dog&status=very%20happy');
expect(req.url).toBe('http://localhost:8000/v1/api/pet/1');
@@ -118,7 +117,7 @@ describe('request operations', function() {
var req = petApi.updatePet(params, opts);
expect(req.method).toBe('PUT');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
expect(req.headers['Content-Type']).toBe('application/json');
expect(req.body).toBe('{\"id\":100,\"name\":\"monster\",\"status\":\"dead\"}');
expect(req.url).toBe('http://localhost:8000/v1/api/pet');
@@ -135,7 +134,7 @@ describe('request operations', function() {
var req = petApi.deletePet(params, opts);
expect(req.method).toBe('DELETE');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
expect(req.headers['Content-Type']).toBe('application/json');
expect(req.url).toBe('http://localhost:8000/v1/api/pet/100');
});
@@ -151,7 +150,7 @@ describe('request operations', function() {
var req = petApi.findPetsByStatus(params, opts);
expect(req.method).toBe('GET');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
test.value(req.headers['Content-Type']).isUndefined();
expect(req.url).toBe('http://localhost:8000/v1/api/pet/findByStatus?status=a%20b%20c%20d%20e');
});
@@ -167,16 +166,16 @@ describe('request operations', function() {
var req = petApi.getPetById(params, opts);
expect(req.method).toBe('GET');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
test.value(req.headers['Content-Type']).isUndefined();
expect(req.url).toBe('http://localhost:8000/v1/api/pet/false');
});
it('tests the urlify function', function() {
- var op = sample.apis['pet'].operations.getPetById
+ var op = sample.apis.pet.operations.getPetById;
op.pathJson = function() {
- return "/entities/{id:([a-z0-9-]{36})}"
- }
+ return "/entities/{id:([a-z0-9-]{36})}";
+ };
// console.log(op.urlify({petId: 1, 'id:\(\[a\-z0\-9\-\]\{36\}\)': 'ok'}));
});
@@ -191,7 +190,7 @@ describe('request operations', function() {
});
it('tests the body param when name is not `body`, per #168', function() {
- var op = sample.apis['pet'].operations.addPet
+ var op = sample.apis.pet.operations.addPet;
op.parameters[0].name = 'pet';
var params = {
@@ -206,7 +205,7 @@ describe('request operations', function() {
it('verifies headers when fetching the swagger specification', function() {
var sample = new swagger.SwaggerClient('http://localhost:8000/api-docs.json');
var req = sample.build(true);
- expect(req.headers['accept']).toBe('application/json;charset=utf-8,*/*');
+ expect(req.headers.accept).toBe('application/json;charset=utf-8,*/*');
});
it('allows override of headers when fetching the swagger specification', function() {
@@ -215,7 +214,7 @@ describe('request operations', function() {
};
var sample = new swagger.SwaggerClient('http://localhost:8000/api-docs.json', opts);
var req = sample.build(true);
- expect(req.headers['accept']).toBe('foo/bar');
+ expect(req.headers.accept).toBe('foo/bar');
});
it('verifies the http request object for a GET with email address query params per https://github.com/swagger-api/swagger-ui/issues/814', function() {
@@ -229,7 +228,7 @@ describe('request operations', function() {
var req = petApi.findPetsByStatus(params, opts);
expect(req.method).toBe("GET");
- expect(req.headers["Accept"]).toBe("application/json");
+ expect(req.headers.Accept).toBe("application/json");
expect(req.url).toBe("http://localhost:8000/v1/api/pet/findByStatus?status=fehguy%40gmail.com");
});
@@ -241,7 +240,7 @@ describe('request operations', function() {
var req = petApi.findPetsByTags(params, opts);
expect(req.method).toBe('GET');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
test.value(req.headers['Content-Type']).isUndefined();
expect(req.url).toBe('http://localhost:8000/v1/api/pet/findByTags');
});
@@ -254,8 +253,8 @@ describe('request operations', function() {
var req = petApi.findPetsByTags(params, opts);
expect(req.method).toBe('GET');
- expect(req.headers['Accept']).toBe('application/json');
+ expect(req.headers.Accept).toBe('application/json');
test.value(req.headers['Content-Type']).isUndefined();
expect(req.url).toBe('http://localhost:8000/v1/api/pet/findByTags');
});
-})
\ No newline at end of file
+});
diff --git a/test/mock.js b/test/mock.js
index 70d84f5b2..344f06086 100644
--- a/test/mock.js
+++ b/test/mock.js
@@ -8,7 +8,7 @@ var sample;
exports.petstore = function(arg1, arg2, arg3, arg4) {
var done = arg1, opts = arg2, callback = arg3, macros = arg4;
if(typeof arg2 === 'function') {
- opts = null;
+ opts = {};
callback = arg2;
macros = arg3;
}
@@ -57,8 +57,6 @@ exports.petstore = function(arg1, arg2, arg3, arg4) {
}).listen(8000);
instance.on("listening", function() {
- var self = {}; self.stop = done;
-
if(macros) {
if(macros.parameter) {
console.log(' warn: set parameter macro');
@@ -69,17 +67,12 @@ exports.petstore = function(arg1, arg2, arg3, arg4) {
swagger.modelPropertyMacro = macros.modelProperty;
}
}
- var sample = new swagger.SwaggerClient({url: 'http://localhost:8000/v2/petstore.json', opts: opts});
- sample.build();
- var count = 0, isDone = false;
- var f = function () {
- if(!isDone) {
- isDone = true;
- self.stop();
- }
+ opts.url = 'http://localhost:8000/v2/petstore.json';
+ opts.success = function() {
+ done();
callback(sample, instance);
return;
};
- setTimeout(f, 50);
+ var sample = new swagger.SwaggerClient(opts);
});
};
\ No newline at end of file
diff --git a/test/models.js b/test/models.js
index 300c69083..003fdc568 100644
--- a/test/models.js
+++ b/test/models.js
@@ -14,9 +14,9 @@ describe('models', function() {
type: "string"
}
}
- }
+ };
var model = new swagger.Model('Tag', definition);
- expect(model.createJSONSample()).toEqual({ id: 0, name: 'string' })
+ expect(model.createJSONSample()).toEqual({ id: 0, name: 'string' });
});
it('should verify the JSON sample for a primitive array', function() {
@@ -25,7 +25,7 @@ describe('models', function() {
items: {
type: "string"
}
- }
+ };
var model = new swagger.Model('Tag', definition);
expect(model.createJSONSample()).toEqual(['string']);
});
@@ -45,7 +45,7 @@ describe('models', function() {
type: 'array'
}
}
- }
+ };
var model = new swagger.Model('Sample', definition);
expect(model.createJSONSample()).toEqual({ id: 0, name: 'string', photos: [ {} ] });
});
@@ -65,7 +65,7 @@ describe('models', function() {
type: 'array'
}
}
- }
+ };
var model = new swagger.Model('Sample', definition);
expect(model.getMockSignature()).toEqual('Sample {id (integer, optional),
name (string, optional),
photos (Array[object], optional)
}');
});
@@ -82,11 +82,11 @@ describe('models', function() {
}
}
}
- }
+ };
var model = new swagger.Model('Sample', definition);
var property = model.properties[0];
// TODO: verify that enums are represented in the mock signature
- console.log(model.createJSONSample());
+ // console.log(model.createJSONSample());
});
it('should not get infinite recursion', function() {
@@ -112,9 +112,9 @@ describe('models', function() {
}
}
}
- }
+ };
var model = new swagger.Model('Component', definition);
- swagger.models['Component'] = model;
+ swagger.addModel('Component', model);
expect(model.createJSONSample()).toEqual(
{
pendingComponents: [
@@ -138,7 +138,7 @@ describe('models', function() {
}
};
var model = new swagger.Model('ListOfSelf', definition);
- swagger.models['ListOfSelf'] = model;
+ swagger.addModel('ListOfSelf', model);
expect(model.createJSONSample()).toEqual(
[ 'ListOfSelf' ]
);
@@ -151,8 +151,9 @@ describe('models', function() {
$ref: 'DictionaryOfSelf'
}
};
+
var model = new swagger.Model('DictionaryOfSelf', definition);
- swagger.models['DictionaryOfSelf'] = model;
+ swagger.addModel.DictionaryOfSelf = model;
// console.log(model.createJSONSample());
// TODO add support for this
});
diff --git a/test/request.js b/test/request.js
index 2583863fb..c08aaf0dc 100644
--- a/test/request.js
+++ b/test/request.js
@@ -116,7 +116,7 @@ describe('swagger request functions', function() {
it('return a json sample in array', function() {
var successResponse = sample.pet.operations.findPetsByTags.successResponse;
- expect(typeof successResponse['200']).toBe('object')
+ expect(typeof successResponse['200']).toBe('object');
expect(successResponse['200'].createJSONSample()).toEqual([
{
"id": 0,
@@ -141,7 +141,7 @@ describe('swagger request functions', function() {
it('return a json sample from an array model', function() {
var successResponse = sample.pet.operations.findPetsByStatus.successResponse;
- expect(typeof successResponse['200']).toBe('object')
+ expect(typeof successResponse['200']).toBe('object');
expect(successResponse['200'].createJSONSample()).toEqual([
{
"id": 0,
diff --git a/test/responses.js b/test/responses.js
index f01aa8048..6e05b8cf6 100644
--- a/test/responses.js
+++ b/test/responses.js
@@ -25,11 +25,11 @@ describe('response types', function() {
200: MonsterResponse,
201: StringResponse,
'default': BasicResponseModel
- }
+ };
var definitions = {
Monster: MonsterModel,
ResponseModel: ResponseModel
- }
+ };
var op = new swagger.Operation(
{},
@@ -44,7 +44,7 @@ describe('response types', function() {
var responseModel = op.successResponse['200'];
expect(op.successResponse['200'].createJSONSample()).toEqual({ id: 0, name: 'string' });
- var responses = op.responses;
+ responses = op.responses;
expect(typeof responses['201']).toBe('object');
expect(typeof responses['default']).toBe('object');
});