From 905c5a61cba461d6905a9370109e7fc50b557f6c Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 25 Jan 2016 09:04:27 +0100 Subject: [PATCH] fix admin e2e --- e2e/helpers/admin-attributes-helper.js | 6 ++++++ e2e/helpers/custom-fields-helper.js | 9 +++++---- e2e/suites/admin/attributes/custom-fields.e2e.js | 16 ++++++++-------- e2e/suites/admin/attributes/priorities.e2e.js | 2 +- e2e/suites/admin/attributes/severities.e2e.js | 2 +- e2e/suites/admin/attributes/status.e2e.js | 2 +- e2e/suites/admin/attributes/types.e2e.js | 2 +- e2e/suites/admin/project/create-delete.e2e.js | 4 +++- 8 files changed, 26 insertions(+), 17 deletions(-) diff --git a/e2e/helpers/admin-attributes-helper.js b/e2e/helpers/admin-attributes-helper.js index d9d0d53a..ad02791b 100644 --- a/e2e/helpers/admin-attributes-helper.js +++ b/e2e/helpers/admin-attributes-helper.js @@ -100,3 +100,9 @@ helper.getGenericForm = function(form) { helper.getGenericNames = function(section) { return section.$$('.status-name span').getText(); }; + +helper.waitLoad = function() { + return browser.wait(function() { + return $('.admin-attributes').isPresent(); + }, 5000); +}; diff --git a/e2e/helpers/custom-fields-helper.js b/e2e/helpers/custom-fields-helper.js index c5607f10..5420a98e 100644 --- a/e2e/helpers/custom-fields-helper.js +++ b/e2e/helpers/custom-fields-helper.js @@ -55,11 +55,12 @@ helper.getCustomFiledsByType = function(indexType) { helper.delete = async function(indexType, indexCustomField) { let customField = helper.getCustomFiledsByType(indexType).get(indexCustomField); - let count = await helper.getCustomFiledsByType(indexType).count(); + browser.actions() + .mouseMove(customField.$('.js-delete-custom-field-button')) + .click() + .perform(); - customField.$('.js-delete-custom-field-button').click(); - - utils.lightbox.confirm.ok(); + return utils.lightbox.confirm.ok(); }; helper.getName = function(indexType, indexCustomField) { diff --git a/e2e/suites/admin/attributes/custom-fields.e2e.js b/e2e/suites/admin/attributes/custom-fields.e2e.js index 45d403df..9a6e008b 100644 --- a/e2e/suites/admin/attributes/custom-fields.e2e.js +++ b/e2e/suites/admin/attributes/custom-fields.e2e.js @@ -64,9 +64,9 @@ describe('custom-fields', function() { it('delete', async function() { let oldCountCustomFields = await customFieldsHelper.getCustomFiledsByType(typeIndex).count(); - customFieldsHelper.delete(typeIndex, 0); + await customFieldsHelper.delete(typeIndex, 0); - browser.wait(async function() { + await browser.wait(async function() { let countCustomFields = await customFieldsHelper.getCustomFiledsByType(typeIndex).count(); return countCustomFields === oldCountCustomFields - 1; @@ -84,13 +84,13 @@ describe('custom-fields', function() { // debounce :( await utils.notifications.success.open(); - await browser.sleep(2000); + await browser.sleep(2500); customFieldsHelper.create(typeIndex, 'test1-multi', 'desc1', 3); // debounce :( await utils.notifications.success.open(); - await browser.sleep(2000); + await browser.sleep(2500); // customFieldsHelper.create(typeIndex, 'test1-date', 'desc1', 4); @@ -122,9 +122,9 @@ describe('custom-fields', function() { it('delete', async function() { let oldCountCustomFields = await customFieldsHelper.getCustomFiledsByType(typeIndex).count(); - customFieldsHelper.delete(typeIndex, 0); + await customFieldsHelper.delete(typeIndex, 0); - browser.wait(async function() { + await browser.wait(async function() { let countCustomFields = await customFieldsHelper.getCustomFiledsByType(typeIndex).count(); return countCustomFields === oldCountCustomFields - 1; @@ -180,9 +180,9 @@ describe('custom-fields', function() { it('delete', async function() { let oldCountCustomFields = await customFieldsHelper.getCustomFiledsByType(typeIndex).count(); - customFieldsHelper.delete(typeIndex, 0); + await customFieldsHelper.delete(typeIndex, 0); - browser.wait(async function() { + await browser.wait(async function() { let countCustomFields = await customFieldsHelper.getCustomFiledsByType(typeIndex).count(); return countCustomFields === oldCountCustomFields - 1; diff --git a/e2e/suites/admin/attributes/priorities.e2e.js b/e2e/suites/admin/attributes/priorities.e2e.js index 65a4f49c..78375b28 100644 --- a/e2e/suites/admin/attributes/priorities.e2e.js +++ b/e2e/suites/admin/attributes/priorities.e2e.js @@ -12,7 +12,7 @@ describe('attributes - priorities', function() { before(async function(){ browser.get(browser.params.glob.host + 'project/project-0/admin/project-values/priorities'); - await utils.common.waitLoader(); + await adminAttributesHelper.waitLoad(); utils.common.takeScreenshot('attributes', 'priorities'); }); diff --git a/e2e/suites/admin/attributes/severities.e2e.js b/e2e/suites/admin/attributes/severities.e2e.js index cff219d0..49d356cf 100644 --- a/e2e/suites/admin/attributes/severities.e2e.js +++ b/e2e/suites/admin/attributes/severities.e2e.js @@ -12,7 +12,7 @@ describe('attributes - severities', function() { before(async function(){ browser.get(browser.params.glob.host + 'project/project-0/admin/project-values/severities'); - await utils.common.waitLoader(); + await adminAttributesHelper.waitLoad(); utils.common.takeScreenshot('attributes', 'severities'); }); diff --git a/e2e/suites/admin/attributes/status.e2e.js b/e2e/suites/admin/attributes/status.e2e.js index 89f5378c..33d1b2c9 100644 --- a/e2e/suites/admin/attributes/status.e2e.js +++ b/e2e/suites/admin/attributes/status.e2e.js @@ -12,7 +12,7 @@ describe('attributes - status', function() { before(async function(){ browser.get(browser.params.glob.host + 'project/project-0/admin/project-values/status'); - await utils.common.waitLoader(); + await adminAttributesHelper.waitLoad(); utils.common.takeScreenshot('attributes', 'status'); }); diff --git a/e2e/suites/admin/attributes/types.e2e.js b/e2e/suites/admin/attributes/types.e2e.js index c6d3b309..bafa68df 100644 --- a/e2e/suites/admin/attributes/types.e2e.js +++ b/e2e/suites/admin/attributes/types.e2e.js @@ -12,7 +12,7 @@ describe('attributes - types', function() { before(async function(){ browser.get(browser.params.glob.host + 'project/project-0/admin/project-values/types'); - await utils.common.waitLoader(); + await adminAttributesHelper.waitLoad(); utils.common.takeScreenshot('attributes', 'types'); }); diff --git a/e2e/suites/admin/project/create-delete.e2e.js b/e2e/suites/admin/project/create-delete.e2e.js index 631704a5..06048212 100644 --- a/e2e/suites/admin/project/create-delete.e2e.js +++ b/e2e/suites/admin/project/create-delete.e2e.js @@ -55,7 +55,9 @@ describe('create-delete project', function() { let linkAdmin = $('#nav-admin a'); utils.common.link(linkAdmin); - await utils.common.waitLoader(); + browser.wait(function() { + return $('.project-details').isPresent(); + }); await createProject.delete(); await browser.waitForAngular();