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

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Browse Source 
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	test/e2e/v2.js
This commit is contained in:
Laurent Lepinay
2015-09-21 14:48:29 +02:00
parent 1a8444c4c0 8bc259558b
commit 1367e8f6fa
12 changed files with 137 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/v2.js
View File

@@ -17,10 +17,10 @@ var elements = [
];
describe('swagger 2.0 spec tests', function () {
this.timeout(10 * 1000);
this.timeout(40 * 1000);
before(function (done) {
this.timeout(25 * 1000);
this.timeout(50 * 1000);
servers.start('/v2/petstore.json', done);
});
@@ -110,6 +110,7 @@ describe('swagger 2.0 spec tests', function () {
});
});
<<<<<<< HEAD
['root.id','root.username','root.firstName','root.lastName', 'root.email', 'root.password', 'root.phone', 'root.userStatus']
.forEach(function (id) {
it('should find a jsoneditor for user post with field: ' + id, function (done) {
@@ -122,7 +123,8 @@ describe('swagger 2.0 spec tests', function () {
// TODO JSonEditor Tests for POST/PUT
after(function() {
after(function(done) {
servers.close();
done();
});
});