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

Merge branch 'develop_2.0' into JSONEditor

Browse Source 
Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
This commit is contained in:
laurent lepinay
2015-03-27 02:15:29 -07:00
parent e7b7465335 311abe7fea
commit 326f542d04
23 changed files with 162 additions and 37839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/v1.js
View File

@@ -20,7 +20,7 @@ describe('swagger 1.x spec tests', function () {
before(function (done) {
this.timeout(25 * 1000);
servers.start('/v1.2/petstore/api-docs', done);
servers.start('/v1.2/petstore/api-docs.json', done);
});
afterEach(function(){
@@ -57,7 +57,8 @@ describe('swagger 1.x spec tests', function () {
});
});
it('should find the contact name element', function(done){
// TODO: enable me
xit('should find the contact name element', function(done){
var locator = webdriver.By.css('.info_name');
driver.isElementPresent(locator).then(function (isPresent) {
expect(isPresent).to.be.true;
@@ -73,7 +74,8 @@ describe('swagger 1.x spec tests', function () {
});
});
it('should find the pet resource description', function(done){
// TODO: enable me
xit('should find the pet resource description', function(done){
var locator = webdriver.By.xpath('//div[contains(., "Operations about pets")]');
driver.findElements(locator).then(function (elements) {
expect(elements.length).to.not.equal(0);