kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1520 from swagger-api/develop_2.0

Browse Source 
Moving to development on master
This commit is contained in:
Ron
2015-08-07 09:54:29 -04:00
parent 8e72906c91 04e52d4a63
commit d9ac809b51
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/javascript/view/OperationView.js
View File

@@ -139,8 +139,8 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
schemaObj = this.model.responses[code].schema; schemaObj = this.model.responses[code].schema;
if (schemaObj && schemaObj.$ref) { if (schemaObj && schemaObj.$ref) {
schema = schemaObj.$ref; schema = schemaObj.$ref;
if (schema.indexOf('#/definitions/') === 0) { if (schema.indexOf('#/definitions/') !== -1) {
schema = schema.substring('#/definitions/'.length); schema = schema.replace(/^.*#\/definitions\//, '');
} }
} }
this.model.responseMessages.push({ this.model.responseMessages.push({

2
test/e2e/servers.js
View File

@@ -29,7 +29,7 @@ module.exports.start = function (specsLocation, done) {
setTimeout(function(){ setTimeout(function(){
driver.get(url); driver.get(url);
done(); done();
}, process.env.TRAVIS ? 20000 : 3000); }, process.env.TRAVIS ? 20000 : 5000);
}; };
module.exports.close = function() { module.exports.close = function() {

11
test/e2e/v1.js
View File

@@ -4,6 +4,7 @@ var expect = require('chai').expect;
var driver = require('./driver'); var driver = require('./driver');
var servers = require('./servers'); var servers = require('./servers');
var webdriver = require('selenium-webdriver'); var webdriver = require('selenium-webdriver');
var until = webdriver.until;
var elements = [ var elements = [
'swagger-ui-container', 'swagger-ui-container',
@@ -39,12 +40,8 @@ describe('swagger 1.x spec tests', function () {
}); });
}); });
it('should have "Swagger UI" in title', function (done) { it('should have "Swagger UI" in title', function () {
driver.sleep(200); return driver.wait(until.titleIs('Swagger UI'), 1000);
driver.getTitle().then(function(title) {
expect(title).to.contain('Swagger UI');
done();
});
}); });
elements.forEach(function (id) { elements.forEach(function (id) {
@@ -102,4 +99,4 @@ describe('swagger 1.x spec tests', function () {
after(function(){ after(function(){
servers.close(); servers.close();
}); });
}); });

12
test/e2e/v2.js
View File

@@ -4,7 +4,7 @@ var expect = require('chai').expect;
var webdriver = require('selenium-webdriver'); var webdriver = require('selenium-webdriver');
var driver = require('./driver'); var driver = require('./driver');
var servers = require('./servers'); var servers = require('./servers');
var until = webdriver.until;
var elements = [ var elements = [
'swagger-ui-container', 'swagger-ui-container',
@@ -40,12 +40,8 @@ describe('swagger 2.0 spec tests', function () {
}); });
}); });
it('should have "Swagger UI" in title', function (done) { it('should have "Swagger UI" in title', function () {
driver.sleep(200); return driver.wait(until.titleIs('Swagger UI'), 1000);
driver.getTitle().then(function(title) {
expect(title).to.contain('Swagger UI');
done();
});
}); });
elements.forEach(function (id) { elements.forEach(function (id) {
@@ -117,4 +113,4 @@ describe('swagger 2.0 spec tests', function () {
after(function() { after(function() {
servers.close(); servers.close();
}); });
}); });