diff --git a/conf.e2e.js b/conf.e2e.js index 7572a15f..1a45e9f9 100644 --- a/conf.e2e.js +++ b/conf.e2e.js @@ -19,7 +19,7 @@ exports.config = { } }, mochaOpts: { - timeout: 30000, + timeout: 45000, compilers: 'js:babel/register' }, capabilities: { diff --git a/e2e/auth/auth.e2e.js b/e2e/auth/auth.e2e.js index b9050c9d..ec33a63b 100644 --- a/e2e/auth/auth.e2e.js +++ b/e2e/auth/auth.e2e.js @@ -122,7 +122,7 @@ describe('auth', function() { $('.lightbox-generic-success .button-green').click(); - expect(utils.lightbox.close('.lightbox-generic-success')).to.be.eventually.equal(true); + await utils.lightbox.close('.lightbox-generic-success'); }); }); @@ -146,7 +146,6 @@ describe('auth', function() { utils.common.takeScreenshot("auth", "delete-account"); - $('#unsuscribe').click(); $('.lightbox-delete-account .button-green').click(); expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host + 'login'); diff --git a/e2e/full/admin/attributes/custom-fields.e2e.js b/e2e/full/admin/attributes/custom-fields.e2e.js index 14246e73..45d403df 100644 --- a/e2e/full/admin/attributes/custom-fields.e2e.js +++ b/e2e/full/admin/attributes/custom-fields.e2e.js @@ -51,7 +51,7 @@ describe('custom-fields', function() { expect(utils.notifications.success.open()).to.be.eventually.true; }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let nameOld = await customFieldsHelper.getName(typeIndex, 0); await customFieldsHelper.drag(typeIndex, 0, 1); @@ -109,7 +109,7 @@ describe('custom-fields', function() { expect(utils.notifications.success.open()).to.be.eventually.true; }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let nameOld = await customFieldsHelper.getName(typeIndex, 0); await customFieldsHelper.drag(typeIndex, 0, 1); @@ -167,7 +167,7 @@ describe('custom-fields', function() { expect(utils.notifications.success.open()).to.be.eventually.true; }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let nameOld = await customFieldsHelper.getName(typeIndex, 0); await customFieldsHelper.drag(typeIndex, 0, 1); diff --git a/e2e/full/admin/attributes/points.e2e.js b/e2e/full/admin/attributes/points.e2e.js index afe390bc..095dab89 100644 --- a/e2e/full/admin/attributes/points.e2e.js +++ b/e2e/full/admin/attributes/points.e2e.js @@ -86,7 +86,7 @@ describe('attributes - points', function() { expect(newStatuses.indexOf(newStatusName)).to.be.not.equal(-1); }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let section = adminAttributesHelper.getSection(0); let rows = section.rows(); let points = await adminAttributesHelper.getPointsNames(section.el); diff --git a/e2e/full/admin/attributes/priorities.e2e.js b/e2e/full/admin/attributes/priorities.e2e.js index 5ceba3b4..65a4f49c 100644 --- a/e2e/full/admin/attributes/priorities.e2e.js +++ b/e2e/full/admin/attributes/priorities.e2e.js @@ -84,7 +84,7 @@ describe('attributes - priorities', function() { expect(newPriorities.indexOf(newPriorityName)).to.be.not.equal(-1); }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let section = adminAttributesHelper.getSection(0); let rows = section.rows(); let priorities = await adminAttributesHelper.getGenericNames(section.el); diff --git a/e2e/full/admin/attributes/severities.e2e.js b/e2e/full/admin/attributes/severities.e2e.js index 518b824e..cff219d0 100644 --- a/e2e/full/admin/attributes/severities.e2e.js +++ b/e2e/full/admin/attributes/severities.e2e.js @@ -84,7 +84,7 @@ describe('attributes - severities', function() { expect(newObjs.indexOf(newName)).to.be.not.equal(-1); }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let section = adminAttributesHelper.getSection(0); let rows = section.rows(); let objs = await adminAttributesHelper.getGenericNames(section.el); diff --git a/e2e/full/admin/attributes/status.e2e.js b/e2e/full/admin/attributes/status.e2e.js index 8d078ad5..89f5378c 100644 --- a/e2e/full/admin/attributes/status.e2e.js +++ b/e2e/full/admin/attributes/status.e2e.js @@ -110,7 +110,7 @@ describe('attributes - status', function() { expect(newStatuses.indexOf(newStatusName)).to.be.not.equal(-1); }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let section = adminAttributesHelper.getSection(0); let rows = section.rows(); let statuses = await adminAttributesHelper.getStatusNames(section.el); diff --git a/e2e/full/admin/attributes/types.e2e.js b/e2e/full/admin/attributes/types.e2e.js index 35e9012d..c6d3b309 100644 --- a/e2e/full/admin/attributes/types.e2e.js +++ b/e2e/full/admin/attributes/types.e2e.js @@ -84,7 +84,7 @@ describe('attributes - types', function() { expect(newObjs.indexOf(newName)).to.be.not.equal(-1); }); - it('drag', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag', async function() { let section = adminAttributesHelper.getSection(0); let rows = section.rows(); let objs = await adminAttributesHelper.getGenericNames(section.el); diff --git a/e2e/full/admin/members.e2e.js b/e2e/full/admin/members.e2e.js index 08a875a0..77618ee1 100644 --- a/e2e/full/admin/members.e2e.js +++ b/e2e/full/admin/members.e2e.js @@ -126,16 +126,16 @@ describe('admin - members', function() { isAdmin = await adminMembershipsHelper.isAdmin(member); expect(isAdmin).not.to.be.true; + } else { + adminMembershipsHelper.toggleAdmin(member); + + await utils.notifications.success.open(); + + isAdmin = await adminMembershipsHelper.isAdmin(member); + + expect(isAdmin).to.be.true; } - adminMembershipsHelper.toggleAdmin(member); - - await utils.notifications.success.open(); - - isAdmin = await adminMembershipsHelper.isAdmin(member); - - expect(isAdmin).to.be.true; - await utils.notifications.success.close(); }); diff --git a/e2e/full/backlog.e2e.js b/e2e/full/backlog.e2e.js index 8cc5b9e3..f5b56bbd 100644 --- a/e2e/full/backlog.e2e.js +++ b/e2e/full/backlog.e2e.js @@ -289,7 +289,7 @@ describe('backlog', function() { expect(sprintRefs.indexOf(draggedRef)).to.be.not.equal(-1); }); - utils.common.browserSkip('firefox', 'reorder milestone us', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'reorder milestone us', async function() { let sprint = backlogHelper.sprints().get(0); let dragableElements = backlogHelper.getSprintUsertories(sprint); @@ -304,7 +304,7 @@ describe('backlog', function() { expect(firstElementRef).to.be.equal(firstElementRef); }); - utils.common.browserSkip('firefox', 'drag us from milestone to milestone', async function() { + utils.common.browserSkip(['firefox', 'internet explorer'], 'drag us from milestone to milestone', async function() { let sprint1 = backlogHelper.sprints().get(0); let sprint2 = backlogHelper.sprints().get(1); diff --git a/e2e/full/user-profile/user-profile.e2e.js b/e2e/full/user-profile/user-profile.e2e.js index 59cbbb17..15ba57f6 100644 --- a/e2e/full/user-profile/user-profile.e2e.js +++ b/e2e/full/user-profile/user-profile.e2e.js @@ -41,7 +41,7 @@ describe('user profile', function() { expect(contactsCount).to.be.above(0); }); - it('edit profile hover', async function() { + it.browserSkip('internet explorer', 'edit profile hover', async function() { let userImage = $('.profile-image-wrapper'); await browser.actions().mouseMove(userImage).perform(); diff --git a/e2e/utils/common.js b/e2e/utils/common.js index 820ad23b..2469d74c 100644 --- a/e2e/utils/common.js +++ b/e2e/utils/common.js @@ -33,10 +33,18 @@ common.isBrowser = async function(browserName) { }; common.browserSkip = function(browserName, name, fn) { - if (browser.browserName !== browserName) { - return it.call(this, name, fn); + if( typeof browserName === 'string') { + if (browser.browserName !== browserName) { + return it.call(this, name, fn); + } else { + return it.skip.call(this, name, fn); + } } else { - return it.skip.call(this, name, fn); + if (browserName.indexOf(browser.browserName) === -1) { + return it.call(this, name, fn); + } else { + return it.skip.call(this, name, fn); + } } }; diff --git a/e2e/utils/detail.js b/e2e/utils/detail.js index 9cf005d9..77a9ba83 100644 --- a/e2e/utils/detail.js +++ b/e2e/utils/detail.js @@ -26,7 +26,7 @@ helper.tagsTesting = async function() { let tagsText = await tagsHelper.getTagsText(); await tagsHelper.clearTags(); let date = Date.now(); - let tags = [1, 2, 3, 4, 5].map((i) => date + "-" + i); + let tags = [1, 2, 3].map((i) => date + "-" + i); tagsHelper.addTags(tags); let newtagsText = await tagsHelper.getTagsText();