fix firefox search e2e

stable
Juanfran 2015-08-12 13:06:19 +02:00
parent 8f27a774af
commit 3b063de52a
3 changed files with 23 additions and 4 deletions

View File

@ -14,7 +14,7 @@ describe('search page', function() {
});
it('lightbox', async function() {
$('#nav-search').click();
$('#nav-search a').click();
let searchLb = $('div[tg-search-box]');
@ -83,6 +83,8 @@ describe('search page', function() {
it('change current tab content on typing in the right column', async function() {
let text = await $$('.table-main').get(0).$('a').getText();
let initialCount = await $$('.table-main').count();
let searchTerm = element(by.model('searchTerm'));
searchTerm.clear();
@ -93,7 +95,8 @@ describe('search page', function() {
let count = await $$('.table-main').count();
expect(count).to.equal(1);
expect(count).to.below(initialCount);
expect(count).to.above(0);
});
});
});

View File

@ -4,6 +4,22 @@ var fs = require('fs');
var uuid = require('node-uuid');
var path = require('path');
common.getElm = function(el) {
var deferred = protractor.promise.defer();
if (typeof el === 'string' || el instanceof String) {
browser.wait(function() {
return browser.isElementPresent($(el).locator());
}, 4000).then(() => {
deferred.fulfill($(el));
});
} else {
deferred.fulfill($(el));
}
return deferred.promise;
};
common.hasClass = async function (element, cls) {
let classes = await element.getAttribute('class');

View File

@ -6,12 +6,12 @@ var transition = 300;
lightbox.open = async function(el) {
var deferred = protractor.promise.defer();
if (typeof el == 'string' || el instanceof String) {
if (typeof el === 'string' || el instanceof String) {
el = $(el);
}
let open = await browser.wait(function() {
return common.hasClass(el, 'open')
return common.hasClass(el, 'open');
}, 4000);
await browser.sleep(transition);