From c318a1b3be2a47b5207fe3ab62efad3922eba298 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Thu, 16 Sep 2021 10:03:57 +0200
Subject: [PATCH] fix tests by ensuring the budibase connection is expanded

---
 packages/builder/cypress/support/commands.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index 2b27b294fb..8bda515fbc 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -37,7 +37,7 @@ Cypress.Commands.add("createApp", name => {
       cy.contains("Create app").click()
     })
     .then(() => {
-      cy.get(".icon.arrow").eq(0).click()
+      cy.expandBudibaseConnection()
       cy.get(".nav-item.selected > .content").should("be.visible")
     })
 })
@@ -82,7 +82,7 @@ Cypress.Commands.add("createTable", tableName => {
 
 Cypress.Commands.add("addColumn", (tableName, columnName, type) => {
   // Select Table
-  //cy.get(".icon.arrow").eq(0).click()
+  cy.selectTable(tableName)
   cy.contains(".nav-item", tableName).click()
   cy.contains("Create column").click()
 
@@ -161,3 +161,15 @@ Cypress.Commands.add("createScreen", (screenName, route) => {
     cy.get(".spectrum-Button--cta").click()
   })
 })
+
+Cypress.Commands.add("expandBudibaseConnection", () => {
+  if (Cypress.$(".nav-item > .content > .opened").length === 0) {
+    // expand the Budibase DB connection string
+    cy.get(".icon.arrow").eq(0).click()
+  }
+})
+
+Cypress.Commands.add("selectTable", tableName => {
+  cy.expandBudibaseConnection()
+  cy.contains(".nav-item", tableName).click()
+})