From 3f5e2595037bc53e79345c434f72b43ef704315f Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 10 Aug 2015 09:04:47 +0200
Subject: [PATCH] fix backlog e2e tests

---
 e2e/full/backlog.e2e.js       |  4 ++--
 e2e/full/search.e2e.js        |  4 +---
 e2e/helpers/backlog-helper.js |  4 ++++
 e2e/helpers/detail-helper.js  |  4 +---
 e2e/utils/detail.js           | 10 ++++++++--
 e2e/utils/notifications.js    | 14 ++++++++++++++
 6 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/e2e/full/backlog.e2e.js b/e2e/full/backlog.e2e.js
index e77cb41f..f7ff030b 100644
--- a/e2e/full/backlog.e2e.js
+++ b/e2e/full/backlog.e2e.js
@@ -505,15 +505,15 @@ describe('backlog', function() {
             newUsCount = await backlogHelper.userStories().count();
 
             expect(newUsCount).to.be.equal(usCount);
+
+            backlogHelper.goBackFilters();
         });
 
         it('filter by tags', async function() {
             let usCount = await backlogHelper.userStories().count();
-
             let htmlChanges = await utils.common.outerHtmlChanges('.backlog-table-body');
 
             $$('.filters-cats a').get(1).click();
-
             await browser.waitForAngular();
 
             $$('.filter-list a').first().click();
diff --git a/e2e/full/search.e2e.js b/e2e/full/search.e2e.js
index fe3c6655..6ff3a2bb 100644
--- a/e2e/full/search.e2e.js
+++ b/e2e/full/search.e2e.js
@@ -8,14 +8,12 @@ var expect = chai.expect;
 
 describe('search page', function() {
     before(async function(){
-        browser.get('http://localhost:9001/');
+        browser.get('http://localhost:9001/project/project-0/');
 
         await utils.common.waitLoader();
     });
 
     it('lightbox', async function() {
-        await utils.common.goToFirstProject();
-
         $('#nav-search').click();
 
         let searchLb = $('div[tg-search-box]');
diff --git a/e2e/helpers/backlog-helper.js b/e2e/helpers/backlog-helper.js
index b4c230c3..85d0f1ec 100644
--- a/e2e/helpers/backlog-helper.js
+++ b/e2e/helpers/backlog-helper.js
@@ -158,3 +158,7 @@ helper.getSprintsRefs = function(sprint) {
 helper.getSprintsTitles = function() {
     return $$('div[tg-backlog-sprint="sprint"] .sprint-name span').getText();
 };
+
+helper.goBackFilters = function() {
+    return $$('.filters-step-cat .breadcrumb a').first().click();
+};
diff --git a/e2e/helpers/detail-helper.js b/e2e/helpers/detail-helper.js
index 28eef6f1..6823c4f8 100644
--- a/e2e/helpers/detail-helper.js
+++ b/e2e/helpers/detail-helper.js
@@ -232,10 +232,8 @@ helper.block = function() {
         block: function() {
             el.$('.item-block').click();
         },
-
         unblock: async function() {
             el.$('.item-unblock').click();
-            await browser.waitForAngular();
         }
     };
 
@@ -251,7 +249,7 @@ helper.blockLightbox = function() {
             return utils.lightbox.open(el);
         },
         waitClose: function() {
-            return utils.lightbox.close(el);
+            return utils.notifications.success.close();
         },
         fill: function(text) {
             el.$('textarea').sendKeys(text);
diff --git a/e2e/utils/detail.js b/e2e/utils/detail.js
index d45a73d6..c5e75b3e 100644
--- a/e2e/utils/detail.js
+++ b/e2e/utils/detail.js
@@ -111,17 +111,23 @@ helper.historyTesting = async function() {
     expect(activitiesCounter).to.be.least(newCommentsCounter);
 }
 
-helper.blockTesting = function() {
+helper.blockTesting = async function() {
     let blockHelper = detailHelper.block();
     let blockLightboxHelper = detailHelper.blockLightbox();
+
     blockHelper.block();
+
     blockLightboxHelper.waitOpen();
     blockLightboxHelper.fill('This is a testing block reason');
     blockLightboxHelper.submit();
-    blockLightboxHelper.waitClose();
+
+    await blockLightboxHelper.waitClose();
+
     expect($('.block-description').getText()).to.be.eventually.equal('This is a testing block reason');
     expect($('.block-description').isDisplayed()).to.be.eventually.true;
+
     blockHelper.unblock();
+
     expect($('.block-description').isDisplayed()).to.be.eventually.false;
 }
 
diff --git a/e2e/utils/notifications.js b/e2e/utils/notifications.js
index fd671260..79ebd9b5 100644
--- a/e2e/utils/notifications.js
+++ b/e2e/utils/notifications.js
@@ -19,6 +19,20 @@ notifications.success.open = function() {
         });
 };
 
+notifications.success.close = function() {
+    var el = $('.notification-message-success');
+
+    return browser
+        .wait(function() {
+            return common.hasClass(el, 'inactive');
+        }, 4000)
+        .then(function(active) {
+            return browser.sleep(transition).then(function() {
+                return active;
+            });
+        });
+};
+
 notifications.error = {};
 notifications.error.open = function() {
     var el = $('.notification-message-error');