From cd4f9f12e3add0d19e72226e367418773db8f8bd Mon Sep 17 00:00:00 2001
From: Mitch-Budibase <mitch@budibase.com>
Date: Tue, 26 Jul 2022 14:43:06 +0100
Subject: [PATCH] Cypress: Smoke build test changes

User Management & Revert App test files changed to better suit the timing of the smoke build
---
 .../integration/adminAndManagement/userManagement.spec.js  | 1 +
 packages/builder/cypress/integration/revertApp.spec.js     | 2 +-
 packages/builder/cypress/support/commands.js               | 7 ++++---
 packages/builder/cypress/support/interact.js               | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
index 562e1e149f..d6a49fe54e 100644
--- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
+++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js
@@ -57,6 +57,7 @@ filterTests(["smoke", "all"], () => {
         cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000})
         cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click()
         cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).contains("bbuser").click()
+        cy.get(interact.SPECTRUM_HEADING).contains("bbuser", { timeout: 2000})
         for (let i = 0; i < 3; i++) {
           cy.get(interact.SPECTRUM_TABLE, { timeout: 3000})
             .eq(1)
diff --git a/packages/builder/cypress/integration/revertApp.spec.js b/packages/builder/cypress/integration/revertApp.spec.js
index 006b6854ba..9a3d17f7c3 100644
--- a/packages/builder/cypress/integration/revertApp.spec.js
+++ b/packages/builder/cypress/integration/revertApp.spec.js
@@ -15,7 +15,7 @@ filterTests(['smoke', 'all'], () => {
             })
             cy.get(interact.SPECTRUM_MODAL).within(() => {
                 // Enter app name before revert
-                cy.get("input").type("Cypress Tests")
+                cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).type("Cypress Tests")
                 cy.intercept('**/revert').as('revertApp')
                 // Click Revert
                 cy.get(interact.SPECTRUM_BUTTON).contains("Revert").click({ force: true })
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index cc92ca280a..16381a8336 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -289,7 +289,7 @@ Cypress.Commands.add("updateAppName", (changedName, noName) => {
 })
 
 Cypress.Commands.add("publishApp", resolvedAppPath => {
-  //Assumes you have navigated to an application first
+  // Assumes you have navigated to an application first
   cy.get(".toprightnav button.spectrum-Button")
     .contains("Publish")
     .click({ force: true })
@@ -301,7 +301,7 @@ Cypress.Commands.add("publishApp", resolvedAppPath => {
       cy.wait(1000)
     })
 
-  //Verify that the app url is presented correctly to the user
+  // Verify that the app url is presented correctly to the user
   cy.get(".spectrum-Modal [data-cy='deploy-app-success-modal']")
     .should("be.visible")
     .within(() => {
@@ -514,7 +514,8 @@ Cypress.Commands.add("searchAndAddComponent", component => {
   cy.get(".spectrum-Button").contains("Component").click({ force: true })
 
   // Search and add component
-  cy.get(".spectrum-Textfield-input").wait(500).clear().type(component)
+  cy.wait(500)
+  cy.get(".spectrum-Textfield-input").clear().type(component)
   cy.get(".body").within(() => {
     cy.get(".component")
       .contains(new RegExp("^" + component + "$"), { timeout: 3000 })
diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js
index b96e2692b4..3f2f348847 100644
--- a/packages/builder/cypress/support/interact.js
+++ b/packages/builder/cypress/support/interact.js
@@ -108,6 +108,7 @@ export const CONTAINER = ".container"
 export const REGENERATE = ".regenerate"
 export const SPECTRUM_DIALOG_CONTENT = ".spectrum-Dialog-content"
 export const SPECTRUM_ICON = ".spectrum-Icon"
+export const SPECTRUM_HEADING = ".spectrum-Heading"
 
 //createView
 export const SPECTRUM_MENU_ITEM_LABEL = ".spectrum-Menu-itemLabel"