From ecacc72cdc62ccef53c24cc5f9b9a8449afd5cc4 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Mon, 25 Apr 2022 16:25:42 +0100
Subject: [PATCH 1/2] Update Commands.js

Updating addDatasourceConfig

Small change for getting the HOST_IP value
---
 packages/builder/cypress/support/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index e4a7f44bac..de2b989d86 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -495,7 +495,7 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
           } else {
             cy.get("input")
               .clear({ force: true })
-              .type(Cypress.env("mysql").HOST, { force: true })
+              .type(Cypress.env("HOST_IP"), { force: true })
           }
         })
       })

From 61dbcb780a50a74a848cdb0e89a21d0b6229c7e6 Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 26 Apr 2022 15:56:11 +0100
Subject: [PATCH 2/2] Updated commands.js

createScreen command now uses a specific data-cy id

also added 1 second wait within selectExternalDatasource - assists with timing for smoke build
---
 packages/builder/cypress/support/commands.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index de2b989d86..6c2cac5b31 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -292,7 +292,7 @@ Cypress.Commands.add("createScreen", (route, accessLevelLabel) => {
   cy.contains("Design").click()
   cy.get("[aria-label=AddCircle]").click()
   cy.get(".spectrum-Modal").within(() => {
-    cy.get(".item").contains("Blank screen").click()
+    cy.get("[data-cy='blank-screen']").click()
     cy.get(".spectrum-Button").contains("Continue").click({ force: true })
     cy.wait(500)
   })
@@ -473,6 +473,7 @@ Cypress.Commands.add("selectExternalDatasource", datasourceName => {
     cy.get(".add-button").click()
   })
   // Clicks specified datasource & continue
+  cy.wait(1000)
   cy.get(".item-list").contains(datasourceName).click()
   cy.get(".spectrum-Dialog-grid").within(() => {
     cy.get(".spectrum-Button").contains("Continue").click({ force: true })