From ef6e4737d746085de463a84ffd7a36d644be5b3d Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Mon, 27 Jul 2015 12:24:15 +0200
Subject: [PATCH] fix some screeshots

---
 e2e/full/kanband.e2e.js         |  2 ++
 e2e/full/taskboard.e2e.js       |  8 ++++----
 e2e/helpers/kanban-helper.js    | 16 ++++++++++++----
 e2e/helpers/taskboard-helper.js |  8 --------
 e2e/utils/common.js             |  2 ++
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/e2e/full/kanband.e2e.js b/e2e/full/kanband.e2e.js
index 01e9d84d..e2acf8f9 100644
--- a/e2e/full/kanband.e2e.js
+++ b/e2e/full/kanband.e2e.js
@@ -255,6 +255,8 @@ describe('kanban', function() {
         it('show archive', async function() {
             $('.icon-open-eye').click();
 
+            await kanbanHelper.scrollRight();
+
             utils.common.takeScreenshot('kanban', 'archive-open');
 
             let usCount = await kanbanHelper.getBoxUss(5).count();
diff --git a/e2e/full/taskboard.e2e.js b/e2e/full/taskboard.e2e.js
index 5f5e8ce9..41c38535 100644
--- a/e2e/full/taskboard.e2e.js
+++ b/e2e/full/taskboard.e2e.js
@@ -150,7 +150,7 @@ describe('taskboard', function() {
 
     describe('folds', function() {
         it('fold row', async function() {
-            await taskboardHelper.foldRow(0);
+            taskboardHelper.foldRow(0);
 
             utils.common.takeScreenshot('taskboard', 'fold-row');
 
@@ -168,7 +168,7 @@ describe('taskboard', function() {
         });
 
         it('fold column', async function() {
-            await taskboardHelper.foldColumn(0);
+            taskboardHelper.foldColumn(0);
 
             utils.common.takeScreenshot('taskboard', 'fold-column');
 
@@ -186,8 +186,8 @@ describe('taskboard', function() {
         });
 
         it('fold row and column', async function() {
-            await taskboardHelper.foldRow(0);
-            await taskboardHelper.foldColumn(0);
+            taskboardHelper.foldRow(0);
+            taskboardHelper.foldColumn(0);
 
             utils.common.takeScreenshot('taskboard', 'fold-column-row');
 
diff --git a/e2e/helpers/kanban-helper.js b/e2e/helpers/kanban-helper.js
index 3033fa50..3b3b8765 100644
--- a/e2e/helpers/kanban-helper.js
+++ b/e2e/helpers/kanban-helper.js
@@ -31,19 +31,27 @@ helper.openBulkUsLb = function(column) {
 };
 
 helper.foldColumn = function(column) {
-    $$('.hfold').get(column).click();
+    let columnNode = helper.getHeaderColumns().get(column);
+
+    columnNode.$$('.options a').get(0).click();
 };
 
 helper.unFoldColumn = function(column) {
-    $$('.hunfold').get(column).click();
+    let columnNode = helper.getHeaderColumns().get(column);
+
+    columnNode.$$('.options a').get(1).click();
 };
 
 helper.foldCards = function(column) {
-    $$('.icon-vfold').get(column).click();
+    let columnNode = helper.getHeaderColumns().get(column);
+
+    columnNode.$$('.options a').get(2).click();
 };
 
 helper.unFoldCards = function(column) {
-    $$('.icon-vunfold').get(column).click();
+    let columnNode = helper.getHeaderColumns().get(column);
+
+    columnNode.$$('.options a').get(3).click();
 };
 
 helper.scrollRight = function() {
diff --git a/e2e/helpers/taskboard-helper.js b/e2e/helpers/taskboard-helper.js
index 7183453a..5f033141 100644
--- a/e2e/helpers/taskboard-helper.js
+++ b/e2e/helpers/taskboard-helper.js
@@ -32,32 +32,24 @@ helper.foldRow = function(row) {
     let icon = $$('.icon-vfold.vfold').get(row);
 
     icon.click();
-
-    return utils.common.waitRequestAnimationFrame();
 };
 
 helper.unFoldRow = function(row) {
     let icon = $$('.icon-vunfold.vunfold').get(row);
 
     icon.click();
-
-    return utils.common.waitRequestAnimationFrame();
 };
 
 helper.foldColumn = function(row) {
     let icon = $$('.icon-vfold.hfold').get(row);
 
     icon.click();
-
-    return utils.common.waitRequestAnimationFrame();
 };
 
 helper.unFoldColumn = function(row) {
     let icon = $$('.icon-vunfold.hunfold').get(row);
 
     icon.click();
-
-    return utils.common.waitRequestAnimationFrame();
 };
 
 helper.editTask = function(row, column, task) {
diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index 588f4381..7bb5d442 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -20,6 +20,8 @@ common.waitLoader = function () {
 };
 
 common.takeScreenshot = async function (section, filename) {
+    await common.waitRequestAnimationFrame();
+
     let cap = await browser.getCapabilities();
     let browserName = cap.caps_.browserName;