From 1d0ad20cfc779372f42a6a988801c77e212d4751 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Wed, 5 Oct 2022 19:38:36 +0530
Subject: [PATCH] test: CY corrections post rebase

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../cypress/integration/common/4h_kanban.js   | 19 ++++++-------------
 scripts/cypress/support/commands.js           |  8 ++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/scripts/cypress/integration/common/4h_kanban.js b/scripts/cypress/integration/common/4h_kanban.js
index 5bc21d3664..ce13e97a0e 100644
--- a/scripts/cypress/integration/common/4h_kanban.js
+++ b/scripts/cypress/integration/common/4h_kanban.js
@@ -46,6 +46,7 @@ function verifyKanbanStackOrder(order) {
 function verifyKanbanStackFooterCount(count) {
   cy.get(".nc-kanban-stack").each(($el, index) => {
     cy.wrap($el)
+      .scrollIntoView()
       .find(".nc-kanban-data-count")
       .should(
         "contain",
@@ -329,6 +330,7 @@ export const genTest = (apiType, dbType) => {
     });
 
     it("Add stack", () => {
+      cy.viewOpen("kanban", 0);
       cy.get(".nc-kanban-add-edit-stack-menu-btn").should("exist").click();
       cy.getActiveMenu(".nc-dropdown-kanban-add-edit-stack-menu").should(
         "be.visible"
@@ -371,9 +373,7 @@ export const genTest = (apiType, dbType) => {
 
       // expand back
       cy.get(".nc-kanban-collapsed-stack").click();
-      cy.get(".nc-kanban-collapsed-stack")
-        .should("not.exist")
-        .should("have.length", 0);
+      cy.get(".nc-kanban-collapsed-stack").should("not.exist");
     });
 
     it("Add record to stack", () => {
@@ -426,15 +426,7 @@ export const genTest = (apiType, dbType) => {
         "NC-17",
         "Test",
       ]);
-      verifyKanbanStackFooterCount([
-        "0",
-        "178",
-        "194",
-        "223",
-        "195",
-        "210",
-        "1",
-      ]);
+      verifyKanbanStackFooterCount(["0", "4", "5", "8", "6", "6", "1"]);
 
       mainPage.toggleShowSystemFields();
     });
@@ -447,7 +439,7 @@ export const genTest = (apiType, dbType) => {
       cy.get(".nc-expand-col-Title")
         .find(".nc-cell > input")
         .then(($el) => {
-          expect($el[0].value).to.have.string("ACE GOLDFINGER");
+          expect($el[0].value).to.have.string("BAREFOOT MANCHURIAN");
         });
       cy.get("body").type("{esc}");
     });
@@ -475,6 +467,7 @@ export const genTest = (apiType, dbType) => {
         "R",
         "NC-17",
       ]);
+      verifyKanbanStackFooterCount(["1", "4", "5", "8", "6", "6"]);
     });
 
     it("Delete Kanban view", () => {
diff --git a/scripts/cypress/support/commands.js b/scripts/cypress/support/commands.js
index 76ae4143a4..4e9e695924 100644
--- a/scripts/cypress/support/commands.js
+++ b/scripts/cypress/support/commands.js
@@ -592,6 +592,14 @@ Cypress.Commands.add("viewRename", (viewType, viewIndex, newName) => {
   cy.get(`.nc-${viewType}-view-item`).contains(`${newName}`).should("exist");
 });
 
+// viewOpen
+//  : open view by index (0-based, exclude default view)
+//
+Cypress.Commands.add("viewOpen", (viewType, viewIndex) => {
+  // click on view
+  cy.get(`.nc-${viewType}-view-item`).eq(viewIndex).click();
+});
+
 // openTableView
 //  : open view by type & name
 //