From 56cb222fd63aaca86e36339370dbdc8c840696c7 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 23 Mar 2016 12:30:11 +0100 Subject: [PATCH] fix leaving project warning close link --- .../common/lightbox/lightbox-leave-project-warning.jade | 5 +++-- e2e/suites/team.e2e.js | 8 ++++++-- e2e/utils/lightbox.js | 4 +--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/partials/common/lightbox/lightbox-leave-project-warning.jade b/app/partials/common/lightbox/lightbox-leave-project-warning.jade index 06ce8158..24210682 100644 --- a/app/partials/common/lightbox/lightbox-leave-project-warning.jade +++ b/app/partials/common/lightbox/lightbox-leave-project-warning.jade @@ -1,5 +1,6 @@ -svg.close.icon.icon-close(href="", title="{{'COMMON.CLOSE' | translate}}") - use(xlink:href="#icon-close") +a.close(href="", title="{{'COMMON.CLOSE' | translate}}") + svg.icon.icon-close(title="{{'COMMON.CLOSE' | translate}}") + use(xlink:href="#icon-close") div.content svg.icon.icon-exclamation use(xlink:href="#icon-exclamation") diff --git a/e2e/suites/team.e2e.js b/e2e/suites/team.e2e.js index da7f33b3..6da84e2e 100644 --- a/e2e/suites/team.e2e.js +++ b/e2e/suites/team.e2e.js @@ -40,8 +40,12 @@ describe('leaving project owner', function(){ let lb = teamHelper.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; }); }); diff --git a/e2e/utils/lightbox.js b/e2e/utils/lightbox.js index b4504568..471bb098 100644 --- a/e2e/utils/lightbox.js +++ b/e2e/utils/lightbox.js @@ -4,13 +4,11 @@ var lightbox = module.exports; var transition = 300; lightbox.exit = function(el) { - var deferred = protractor.promise.defer(); - if (typeof el === 'string' || el instanceof String) { el = $(el); } - el.$('.icon-close').click(); + el.$('.close').click(); }; lightbox.open = async function(el) {