Merge pull request #1612 from swagger-api/client-update

updated client version, rebuilt
This commit is contained in:
Tony Tam
2015-09-19 11:48:36 -07:00
10 changed files with 420 additions and 396 deletions

3
dist/css/print.css vendored
View File

@@ -807,6 +807,9 @@
outline: 2px solid black; outline: 2px solid black;
outline-color: #cc0000; outline-color: #cc0000;
} }
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
max-width: 300px;
}
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
padding: 10px; padding: 10px;

3
dist/css/screen.css vendored
View File

@@ -807,6 +807,9 @@
outline: 2px solid black; outline: 2px solid black;
outline-color: #cc0000; outline-color: #cc0000;
} }
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
max-width: 300px;
}
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
padding: 10px; padding: 10px;

757
dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -50,6 +50,6 @@
"less": "^2.4.0", "less": "^2.4.0",
"mocha": "^2.1.0", "mocha": "^2.1.0",
"selenium-webdriver": "^2.45.0", "selenium-webdriver": "^2.45.0",
"swagger-client": "2.1.4" "swagger-client": "2.1.5"
} }
} }

View File

@@ -807,6 +807,9 @@
outline: 2px solid black; outline: 2px solid black;
outline-color: #cc0000; outline-color: #cc0000;
} }
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
max-width: 300px;
}
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
padding: 10px; padding: 10px;

View File

@@ -807,6 +807,9 @@
outline: 2px solid black; outline: 2px solid black;
outline-color: #cc0000; outline-color: #cc0000;
} }
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] {
max-width: 300px;
}
.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
padding: 10px; padding: 10px;

View File

@@ -28,8 +28,12 @@ module.exports.start = function (specsLocation, done) {
setTimeout(function(){ setTimeout(function(){
driver.get(url); driver.get(url);
done(); setTimeout(function() {
done();
}, 2000);
console.log('waiting for UI to load');
}, process.env.TRAVIS ? 20000 : 5000); }, process.env.TRAVIS ? 20000 : 5000);
console.log('waiting for server to start');
}; };
module.exports.close = function() { module.exports.close = function() {

View File

@@ -96,7 +96,8 @@ describe('swagger 1.x spec tests', function () {
}); });
}); });
after(function(){ after(function(done){
servers.close(); servers.close();
done();
}); });
}); });

View File

@@ -17,10 +17,10 @@ var elements = [
]; ];
describe('swagger 2.0 spec tests', function () { describe('swagger 2.0 spec tests', function () {
this.timeout(10 * 1000); this.timeout(40 * 1000);
before(function (done) { before(function (done) {
this.timeout(25 * 1000); this.timeout(50 * 1000);
servers.start('/v2/petstore.json', done); servers.start('/v2/petstore.json', done);
}); });
@@ -110,7 +110,8 @@ describe('swagger 2.0 spec tests', function () {
}); });
}); });
after(function() { after(function(done) {
servers.close(); servers.close();
done();
}); });
}); });