From 94a01758c00775adc934ae4a30a0a67d047e578c Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Wed, 2 Dec 2015 12:18:22 +0100
Subject: [PATCH] fix watcher keyboard navigation

---
 e2e/helpers/common-helper.js |  3 +++
 e2e/helpers/detail-helper.js |  5 ++++-
 e2e/utils/detail.js          | 15 +++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/e2e/helpers/common-helper.js b/e2e/helpers/common-helper.js
index fc1ee715..6bd7ee3e 100644
--- a/e2e/helpers/common-helper.js
+++ b/e2e/helpers/common-helper.js
@@ -12,6 +12,9 @@ helper.assignToLightbox = function() {
         waitClose: function() {
             return utils.lightbox.close(el);
         },
+        close: function() {
+            el.$$('.icon-delete').first().click();
+        },
         selectFirst: function() {
             el.$$('div[data-user-id]').first().click();
         },
diff --git a/e2e/helpers/detail-helper.js b/e2e/helpers/detail-helper.js
index bc787d86..370d6804 100644
--- a/e2e/helpers/detail-helper.js
+++ b/e2e/helpers/detail-helper.js
@@ -412,6 +412,9 @@ helper.watchersLightbox = function() {
         waitClose: function() {
             return utils.lightbox.close(el);
         },
+        close: function() {
+            el.$$('.icon-delete').first().click();
+        },
         selectFirst: async function() {
             el.$$('div[data-user-id]').first().click();
             await browser.waitForAngular();
@@ -427,7 +430,7 @@ helper.watchersLightbox = function() {
         },
         userList: function() {
             return el.$$('.user-list-single');
-        }        
+        }
     };
 
     return obj;
diff --git a/e2e/utils/detail.js b/e2e/utils/detail.js
index eb65b555..a05f3d64 100644
--- a/e2e/utils/detail.js
+++ b/e2e/utils/detail.js
@@ -3,6 +3,7 @@ var detailHelper = require('../helpers').detail;
 var commonHelper = require('../helpers').common;
 var customFieldsHelper = require('../helpers/custom-fields-helper');
 var commonUtil = require('./common');
+var notifications = require('./notifications');
 
 var chai = require('chai');
 var chaiAsPromised = require('chai-as-promised');
@@ -74,7 +75,7 @@ helper.assignedToTesting = function() {
     before(function () {
         let assignedTo = detailHelper.assignedTo();
         return assignedTo.clear();
-    })
+    });
 
     it('assign', async function() {
         let assignedTo = detailHelper.assignedTo();
@@ -124,6 +125,7 @@ helper.assignedToTesting = function() {
         assignToLightbox.selectFirst();
 
         await assignToLightbox.waitClose();
+        await notifications.success.close();
     });
 
     it('keyboard navigatin', async function() {
@@ -147,6 +149,10 @@ helper.assignedToTesting = function() {
         let isSelected = await commonUtil.hasClass(selected, 'selected');
 
         expect(isSelected).to.be.true;
+
+        assignToLightbox.close();
+
+        await assignToLightbox.waitClose();
     });
 }
 
@@ -259,7 +265,7 @@ helper.watchersTesting = function() {
     before(function () {
         let watchersHelper = detailHelper.watchers();
         return watchersHelper.removeAllWatchers();
-    })
+    });
 
     it('add watcher', async function() {
         let watchersHelper = detailHelper.watchers();
@@ -309,6 +315,7 @@ helper.watchersTesting = function() {
 
         await watchersLightboxHelper.selectFirst();
         await watchersLightboxHelper.waitClose();
+        await notifications.success.close();
     });
 
     it('keyboard navigatin', async function() {
@@ -331,6 +338,10 @@ helper.watchersTesting = function() {
         let isSelected = await commonUtil.hasClass(selected, 'selected');
 
         expect(isSelected).to.be.true;
+
+        watchersLightboxHelper.close();
+
+        await watchersLightboxHelper.waitClose();
     });
 }