From b636cfd5cf7a4318bba699f4865b30ff98fbfda0 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 23 Mar 2016 14:15:49 +0100 Subject: [PATCH] several e2e fixes --- app/coffee/modules/admin/memberships.coffee | 3 +-- .../includes/modules/related-tasks.jade | 2 +- e2e/helpers/admin-memberships.js | 2 +- e2e/helpers/custom-fields-helper.js | 9 ++++---- e2e/helpers/issues-helper.js | 6 ++--- e2e/helpers/us-detail-helper.js | 11 +++++++--- e2e/shared/detail.js | 4 +++- e2e/suites/admin/members.e2e.js | 8 +++++-- e2e/suites/admin/project/create-delete.e2e.js | 22 +++++++++---------- e2e/suites/issues/issues.e2e.js | 4 +++- e2e/suites/tasks/taskboard.e2e.js | 2 +- e2e/utils/common.js | 2 ++ 12 files changed, 43 insertions(+), 32 deletions(-) diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee index a85ae6e2..d50009b0 100644 --- a/app/coffee/modules/admin/memberships.coffee +++ b/app/coffee/modules/admin/memberships.coffee @@ -486,9 +486,8 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla return {link: link} - module.directive("tgMembershipsRowActions", ["$log", "$tgRepo", "$tgResources", "$tgConfirm", "$compile", - "$translate", MembershipsRowActionsDirective]) + "$translate", "tgCurrentUserService", "tgLightboxFactory", MembershipsRowActionsDirective]) ############################################################################# diff --git a/app/partials/includes/modules/related-tasks.jade b/app/partials/includes/modules/related-tasks.jade index da0c24ba..c7a5054e 100644 --- a/app/partials/includes/modules/related-tasks.jade +++ b/app/partials/includes/modules/related-tasks.jade @@ -6,7 +6,7 @@ section.related-tasks( span.related-tasks-title(translate="COMMON.RELATED_TASKS") div(tg-related-task-create-button) .related-tasks-body - .row.single-related-task( + .row.single-related-task.js-related-task( ng-repeat="task in tasks" ng-class="{closed: task.is_closed, blocked: task.is_blocked, iocaine: task.is_iocaine}" tg-related-task-row diff --git a/e2e/helpers/admin-memberships.js b/e2e/helpers/admin-memberships.js index cb420c35..bcef88a6 100644 --- a/e2e/helpers/admin-memberships.js +++ b/e2e/helpers/admin-memberships.js @@ -7,7 +7,7 @@ helper.openNewMemberLightbox = function() { }; helper.getNewMemberLightbox = function() { - let el = $('div[tg-lb-create-members]'); + let el = $('div[tg-lb-add-members]'); let obj = { el: el, diff --git a/e2e/helpers/custom-fields-helper.js b/e2e/helpers/custom-fields-helper.js index 5420a98e..84a6d5ef 100644 --- a/e2e/helpers/custom-fields-helper.js +++ b/e2e/helpers/custom-fields-helper.js @@ -2,20 +2,19 @@ var utils = require('../utils'); var helper = module.exports; -helper.create = function(indexType, name, desc, option) { +helper.create = async function(indexType, name, desc, option) { let type = $$('div[tg-project-custom-attributes]').get(indexType); type.$('.js-add-custom-field-button').click(); - let form = type.$$('form').last(); - form.$('input[name="name"]').sendKeys(name); - form.$('input[name="description"]').sendKeys(desc); + await form.$('input[name="name"]').sendKeys(name); + await form.$('input[name="description"]').sendKeys(desc); form.$(`select option:nth-child(${option})`).click(); let saveButton = form.$('.js-create-custom-field-button'); - browser.actions() + return browser.actions() .mouseMove(saveButton) .click() .perform(); diff --git a/e2e/helpers/issues-helper.js b/e2e/helpers/issues-helper.js index ef66b5d0..ec081fc6 100644 --- a/e2e/helpers/issues-helper.js +++ b/e2e/helpers/issues-helper.js @@ -134,13 +134,13 @@ helper.getCustomFilters = function() { }; helper.removeCustomFilters = async function() { - let count = await $$('.filter-list .icon-delete').count(); + let count = await $$('.filter-list .remove-filter').count(); while(count) { - $$('.filter-list .icon-delete').get(0).click(); + $$('.filter-list .remove-filter').get(0).click(); await utils.lightbox.confirm.ok(); - count = await $$('.filter-list .icon-delete').count(); + count = await $$('.filter-list .remove-filter').count(); } }; diff --git a/e2e/helpers/us-detail-helper.js b/e2e/helpers/us-detail-helper.js index 9e538ab0..563530ae 100644 --- a/e2e/helpers/us-detail-helper.js +++ b/e2e/helpers/us-detail-helper.js @@ -44,7 +44,7 @@ helper.clientRequirement = function() { }; helper.relatedTaskForm = async function(form, name, status, assigned_to) { - form.$('input').sendKeys(name); + await form.$('input').sendKeys(name); let taskStatus = form.$('.task-status'); @@ -58,7 +58,12 @@ helper.relatedTaskForm = async function(form, name, status, assigned_to) { await assignToLightbox.selectFirst(); await assignToLightbox.waitClose(); - form.$('.icon-save').click(); + let saveBtn = form.$('.icon-save'); + + await browser.actions() + .mouseMove(saveBtn) + .click() + .perform(); }; helper.createRelatedTasks = function(name, status, assigned_to) { @@ -94,5 +99,5 @@ helper.deleteRelatedTask = function(taskIndex, name, status, assigned_to) { }; helper.relatedTasks = function() { - return $$('.related-tasks-body .single-related-task'); + return $$('.js-related-task'); }; diff --git a/e2e/shared/detail.js b/e2e/shared/detail.js index a9b1a361..40bac601 100644 --- a/e2e/shared/detail.js +++ b/e2e/shared/detail.js @@ -367,7 +367,9 @@ shared.customFields = function(typeIndex) { before(async function() { let url = await browser.getCurrentUrl(); let rootUrl = await commonUtil.getProjectUrlRoot(); - browser.get(rootUrl + '/admin/project-values/custom-fields'); + + await browser.get(rootUrl + '/admin/project-values/custom-fields'); + await browser.sleep(2000); await customFieldsHelper.create(typeIndex, 'detail-test-custom-fields-text', 'desc1', 1); diff --git a/e2e/suites/admin/members.e2e.js b/e2e/suites/admin/members.e2e.js index 02de904b..399d2ffe 100644 --- a/e2e/suites/admin/members.e2e.js +++ b/e2e/suites/admin/members.e2e.js @@ -106,8 +106,12 @@ describe('admin - members', function() { let lb = adminMembershipsHelper.leavingProjectWarningLb(); - await utils.lightbox.exit(lb); - await utils.lightbox.close(lb); + await utils.lightbox.open(lb); + + utils.lightbox.exit(lb); + + let isPresent = await lb.isPresent(); + expect(isPresent).to.be.false; }); it('change role', async function() { diff --git a/e2e/suites/admin/project/create-delete.e2e.js b/e2e/suites/admin/project/create-delete.e2e.js index 06048212..fa338d0a 100644 --- a/e2e/suites/admin/project/create-delete.e2e.js +++ b/e2e/suites/admin/project/create-delete.e2e.js @@ -22,33 +22,31 @@ describe('create-delete project', function() { createProject.openWizard(); await lb.waitOpen(); + + utils.common.takeScreenshot('project-wizard', 'create-project'); }); - it('create - step 1', async function() { - utils.common.takeScreenshot('project-wizard', 'step1'); - - await lb.next(); - }); - - it('create - step 2 errors', async function() { - utils.common.takeScreenshot('project-wizard', 'step2'); + it('create project error', async function() { + utils.common.takeScreenshot('project-wizard', 'create-project-errors'); await lb.submit(); - utils.common.takeScreenshot('project-wizard', 'step2-error'); - let errors = await lb.errors().count(); expect(errors).to.be.equal(2); }); - it('create - step 2', async function() { + it('create project', async function() { lb.name().sendKeys('aaa'); lb.description().sendKeys('bbb'); await lb.submit(); - expect(utils.notifications.success.open()).to.be.eventually.true; + let open = utils.notifications.success.open(); + + expect(open).to.be.equal.true; + + await utils.notifications.success.close(); }); it('delete', async function() { diff --git a/e2e/suites/issues/issues.e2e.js b/e2e/suites/issues/issues.e2e.js index 8eeb93f1..8c840e0f 100644 --- a/e2e/suites/issues/issues.e2e.js +++ b/e2e/suites/issues/issues.e2e.js @@ -307,7 +307,9 @@ describe('issues list', function() { it('remove custom filter', async function() { await issuesHelper.removeCustomFilters(); - expect(issuesHelper.getCustomFilters().count()).to.be.eventually.equal(0); + let customFilterCount = await issuesHelper.getCustomFilters().count(); + + expect(customFilterCount).to.be.equal(0); }); }); }); diff --git a/e2e/suites/tasks/taskboard.e2e.js b/e2e/suites/tasks/taskboard.e2e.js index c1ba08e6..1bfa66d6 100644 --- a/e2e/suites/tasks/taskboard.e2e.js +++ b/e2e/suites/tasks/taskboard.e2e.js @@ -151,7 +151,7 @@ describe('taskboard', function() { }); }); - describe.only('folds', function() { + describe('folds', function() { it('fold row', async function() { taskboardHelper.foldRow(0); diff --git a/e2e/utils/common.js b/e2e/utils/common.js index 4877c918..4c981c2e 100644 --- a/e2e/utils/common.js +++ b/e2e/utils/common.js @@ -74,6 +74,8 @@ common.link = async function(el) { return (href.length > 1 && href !== browser.params.glob.host + "#"); }, 5000); + + await browser .actions() .mouseMove(el)