Merge pull request #6167 from Budibase/cypress-testing

Cypress: Templates, Icon test, Command file updates

packages/builder/cypress/integration/appOverview.spec.js

@@ -132,20 +132,34 @@ filterTests(['all'], () => {
       })
     })
 
-    it("Should allow the editing of the application icon", () => { 
+    it("Should allow the editing of the application icon and colour", () => { 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
-
+      cy.get(".appTable", { timeout: 2000})
-      cy.get(".appTable .name").eq(0).click()
+        .within(() => {
-
+          cy.get(".app-row-actions-icon").eq(0).click()
-      cy.get(".app-logo .edit-hover").should("exist").invoke("show").click()
+        })
-
+      cy.get(".spectrum-Menu").contains("Edit icon").click()
-      cy.customiseAppIcon()
+      // Select random icon
-
+      cy.get(".grid").within(() => {
-      cy.get(".app-logo")
+          cy.get(".icon-item").eq(Math.floor(Math.random() * 23) + 1).click()
+      })
+      // Select random colour
+      cy.get(".fill").click()
+      cy.get(".colors").within(() => {
+          cy.get(".color").eq(Math.floor(Math.random() * 33) + 1).click()
+      })
+      cy.intercept('**/applications/**').as('iconChange')
+      cy.get(".spectrum-Button").contains("Save").click({ force: true })
+      cy.wait("@iconChange")
+      cy.get("@iconChange").its('response.statusCode')
+      .should('eq', 200)
+      // Confirm icon has changed from default
+      // Confirm colour has been applied
+      cy.get(".appTable", { timeout: 2000})
         .within(() => {
           cy.get('[aria-label]').eq(0).children()
           .should('have.attr', 'xlink:href').and('not.contain', '#spectrum-icon-18-Apps')
-        cy.get(".app-icon")
+          cy.get(".title").children().children()
           .should('have.attr', 'style').and('contains', 'color')
         })
     })
@@ -259,6 +273,7 @@ filterTests(['all'], () => {
       });
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.wait(1000)
       cy.get(".appTable .name").eq(0).click()
       cy.get(".spectrum-Tabs-item").contains("Settings").click()
       cy.get(".spectrum-Tabs-item.is-selected").contains("Settings")
@@ -269,7 +284,7 @@ filterTests(['all'], () => {
 
     })
 
-    it("Should allow copying of the published application Id", () => {
+    xit("Should allow copying of the published application Id", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.get(".appTable .app-row-actions").eq(0)
       .within(() => {

packages/builder/cypress/integration/changeAppIconAndColour.spec.js

@@ -1,44 +0,0 @@
-import filterTests from "../support/filterTests"
-
-filterTests(['all'], () => {
-  context("Change Application Icon and Colour", () => {
-      before(() => {
-        cy.login()
-      })
-
-      it("should change the icon and colour for an application", () => {
-          // Search for test application
-          cy.applicationInAppTable("Cypress Tests")
-          cy.get(".appTable")
-            .within(() => {
-              cy.get(".app-row-actions-icon").eq(0).click()
-            })
-          cy.get(".spectrum-Menu").contains("Edit icon").click()
-          // Select random icon
-          cy.get(".grid").within(() => {
-              cy.get(".icon-item").eq(Math.floor(Math.random() * 23) + 1).click()
-          })
-          // Select random colour
-          cy.get(".fill").click()
-          cy.get(".colors").within(() => {
-              cy.get(".color").eq(Math.floor(Math.random() * 33) + 1).click()
-          })
-          cy.intercept('**/applications/**').as('iconChange')
-          cy.get(".spectrum-Button").contains("Save").click({ force: true })
-          cy.wait("@iconChange")
-          cy.get("@iconChange").its('response.statusCode')
-          .should('eq', 200)
-          cy.wait(1000)
-          // Confirm icon has changed from default
-          // Confirm colour has been applied - There is no default colour
-          cy.get(".appTable")
-            .within(() => {
-              cy.get('[aria-label]').eq(0).children()
-              .should('have.attr', 'xlink:href').and('not.contain', '#spectrum-icon-18-Apps')
-              cy.get(".title").children().children()
-              .should('have.attr', 'style').and('contains', 'color')
-            })
-          cy.deleteAllApps()
-      })
-  })
-})

packages/builder/cypress/integration/templates/HR/hrTemplateDetails.spec.js

@@ -1,56 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify HR Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter HR Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="HR"]').click()
-      })
-    })
-
-  it("should verify the details option for HR templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-
-            if (templateNameText == "Job Application Tracker") {
-              // Template name should include 'applicant-tracking-system'
-              cy.get('a')
-              .should('have.attr', 'href').and('contain', 'applicant-tracking-system')
-            }
-            else if (templateNameText == "Job Portal App") {
-              // Template name should include 'job-portal'
-              const templateNameSplit = templateNameParsed.split('-app')[0]
-              cy.get('a')
-              .should('have.attr', 'href').and('contain', templateNameSplit)
-            }
-            else {
-              cy.get('a')
-              .should('have.attr', 'href').and('contain', templateNameParsed)
-            }
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/HR/jobApplicationTracker.spec.js

@@ -1,222 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Job Application Tracker Template Functionality", () => {
-    const templateName = "Job Application Tracker"
-    const templateNameParsed = templateName.toLowerCase().replace(/\s+/g, '-')
-    
-    before(() => {
-        cy.login()
-        cy.deleteApp(templateName)
-        // Template navigation
-        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`, {
-            onBeforeLoad(win) {
-                cy.stub(win, 'open')
-            }
-        })
-        cy.wait(2000)
-        })
-
-    it("should create and publish app with Job Application Tracker template", () => {
-        // Select Job Application Tracker template
-        cy.get(".template-thumbnail-text")
-            .contains(templateName).parentsUntil(".template-grid").within(() => {
-                cy.get(".spectrum-Button").contains("Use template").click({ force: true })
-            })
-
-        // Confirm URL matches template name
-        const appUrl = cy.get(".app-server")
-        appUrl.invoke('text').then(appUrlText => {
-            expect(appUrlText).to.equal(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-        })
-
-        // Create App
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("Create app").click({ force: true })
-        })
-
-        // Publish App & Verify it opened
-        cy.wait(2000) // Wait for app to generate
-        cy.publishApp(true)
-        cy.window().its('open').should('be.calledOnce')
-    })
-
-    it("should add active/inactive vacancies", () => {
-        // Visit published app
-        cy.visit(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-
-        // loop for active/inactive vacancies
-        for (let i = 0; i < 2; i++) {
-            // Vacancies section
-            cy.get(".links").contains("Vacancies").click({ force: true })
-            cy.get(".spectrum-Button").contains("Create New").click()
-
-            // Add inactive vacancy
-            // Title
-            cy.get('[data-name="Title"]').within(() => {
-                cy.get(".spectrum-Textfield").type("Tester")
-            })
-
-            // Closing Date
-            cy.get('[data-name="Closing date"]').within(() => {
-                cy.get('[aria-label=Calendar]').click({ force: true })
-            })
-            cy.get("[aria-current=date]").click()
-
-            // Department
-            cy.get('[data-name="Department"]').within(() => {
-                cy.get(".spectrum-Picker-label").click()
-            })
-            cy.get(".spectrum-Menu").find('li').its('length').then(len => {
-                cy.get(".spectrum-Menu-item").eq(Math.floor(Math.random() * len)).click()
-            })
-
-            // Employment Type
-            cy.get('[data-name="Employment type"]').within(() => {
-                cy.get(".spectrum-Picker-label").click()
-            })
-            cy.get(".spectrum-Menu").find('li').its('length').then(len => {
-                cy.get(".spectrum-Menu-item").eq(Math.floor(Math.random() * len)).click()
-            })
-
-            // Salary
-            cy.get('[data-name="Salary ($)"]').within(() => {
-                cy.get(".spectrum-Textfield").type(40000)
-            })
-
-            // Description
-            cy.get('[data-name="Description"]').within(() => {
-                cy.get(".spectrum-Textfield").type("description")
-            })
-
-            // Responsibilities
-            cy.get('[data-name="Responsibilities"]').within(() => {
-                cy.get(".spectrum-Textfield").type("Responsibilities")
-            })
-
-            // Requirements
-            cy.get('[data-name="Requirements"]').within(() => {
-                cy.get(".spectrum-Textfield").type("Requirements")
-            })
-
-            // Hiring manager
-            cy.get('[data-name="Hiring manager"]').within(() => {
-                cy.get(".spectrum-Picker-label").click()
-            })
-            cy.get(".spectrum-Menu").find('li').its('length').then(len => {
-                cy.get(".spectrum-Menu-item").eq(Math.floor(Math.random() * len)).click()
-            })
-
-            // Active
-            if (i == 0) {
-                cy.get('[data-name="Active"]').within(() => {
-                    cy.get(".spectrum-Checkbox-box").click({ force: true })
-                })
-            }
-
-            // Location
-            cy.get('[data-name="Location"]').within(() => {
-                cy.get(".spectrum-Picker-label").click()
-            })
-            cy.get(".spectrum-Menu").find('li').its('length').then(len => {
-                cy.get(".spectrum-Menu-item").eq(Math.floor(Math.random() * len)).click()
-            })
-
-            // Save vacancy
-            cy.get(".spectrum-Button").contains("Save").click({ force: true })
-            cy.wait(1000)
-
-            // Check table was updated
-            cy.get('[data-name="Vacancies Table"]').eq(i).should('contain', 'Tester')
-        }
-        })
-
-    xit("should filter applications by stage", () => {
-        // Visit published app
-        cy.visit(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-        cy.wait(1000)
-
-        // Applications section
-        cy.get(".links").contains("Applications").click({ force: true })
-        cy.wait(1000)
-
-        // Filter by stage - Confirm table updates
-        cy.get(".spectrum-Picker").contains("Filter by stage").click({ force: true })
-        cy.get(".spectrum-Menu").find('li').its('length').then(len => {
-            for (let i = 1; i < len; i++) {
-                cy.get(".spectrum-Menu-item").eq(i).click()
-                const stage = cy.get(".spectrum-Picker-label")
-                stage.invoke('text').then(stageText => {
-                    if (stageText == "1st interview") {
-                        cy.get(".placeholder").should('contain', 'No rows found')
-                    }
-                    else {
-                        cy.get(".spectrum-Table-row").should('contain', stageText)
-                    }
-                    cy.get(".spectrum-Picker").contains(stageText).click({ force: true })
-                })
-            }
-        })
-    })
-
-    xit("should edit an application", () => {
-        // Switch application from not hired to hired
-        // Visit published app
-        cy.visit(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-        cy.wait(1000)
-
-        // Not Hired section
-        cy.get(".links").contains("Not hired").click({ force: true })
-        cy.wait(500)
-
-        // View application
-        cy.get(".spectrum-Table").within(() => {
-            cy.get(".spectrum-Button").contains("View").click({ force: true })
-            cy.wait(500)
-        })
-
-        // Update value for 'Staged'
-        cy.get('[data-name="Stage"]').within(() => {
-            cy.get(".spectrum-Picker-label").click()
-        })
-        cy.get(".spectrum-Menu").within(() => {
-            cy.get(".spectrum-Menu-item").contains("Hired").click()
-        })
-
-        // Save application
-        cy.get(".spectrum-Button").contains("Save").click({ force: true })
-        cy.wait(500)
-
-        // Hired section
-        cy.get(".links").contains("Hired").click({ force: true })
-        cy.wait(500)
-
-        // Verify Table size - Total rows = 2
-        cy.get(".spectrum-Table").find(".spectrum-Table-row").its('length').then((len => {
-            expect(len).to.eq(2)
-        }))
-    })
-
-    xit("should delete an application", () => {
-        // Visit published app
-        cy.visit(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-        cy.wait(1000)
-
-        // Hired section
-        cy.get(".links").contains("Hired").click({ force: true })
-        cy.wait(500)
-
-        // View first application
-        cy.get(".spectrum-Table-row").eq(0).within(() => {
-            cy.get(".spectrum-Button").contains("View").click({ force: true })
-            cy.wait(500)
-        })
-
-        // Delete application
-        cy.get(".spectrum-Button").contains("Delete").click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("Confirm").click()
-        })
-    })
-    })
-})

packages/builder/cypress/integration/templates/IT/ITTemplateDetails.spec.js

@@ -1,60 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify IT Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter IT Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="IT"]').click()
-      })
-    })
-
-  it("should verify the details option for IT templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            
-            if (templateNameText == "Hashicorp Scorecard Template") {
-                const templateNameSplit = templateNameParsed.split('-template')[0]
-                cy.get('a')
-                .should('have.attr', 'href').and('contain', templateNameSplit)
-            }
-            else if (templateNameText == "IT Ticketing System") {
-                const templateNameSplit = templateNameParsed.split('it-')[1]
-                cy.get('a')
-                .should('have.attr', 'href').and('contain', templateNameSplit)
-            }
-            else if (templateNameText == "IT Incident Report Form") {
-                const templateNameSplit = templateNameParsed.split('-form')[0]
-                cy.get('a')
-                .should('have.attr', 'href').and('contain', templateNameSplit)
-            }
-            else {
-                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-            }
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/IT/ITTicketingSystem.spec.js

@@ -1,72 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("IT Ticketing System Template Functionality", () => {
-    const templateName = "IT Ticketing System"
-    const templateNameParsed = templateName.toLowerCase().replace(/\s+/g, '-')
-    
-    before(() => {
-        cy.login()
-        cy.deleteApp(templateName)
-        // Template navigation
-        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`, {
-            onBeforeLoad(win) {
-                cy.stub(win, 'open')
-            }
-        })
-        cy.wait(2000)
-        })
-
-    it("should create and publish app with IT Ticketing System template", () => {
-        // Select IT Ticketing System template
-        cy.get(".template-thumbnail-text")
-            .contains(templateName).parentsUntil(".template-grid").within(() => {
-                cy.get(".spectrum-Button").contains("Use template").click({ force: true })
-            })
-
-        // Confirm URL matches template name
-        const appUrl = cy.get(".app-server")
-        appUrl.invoke('text').then(appUrlText => {
-            expect(appUrlText).to.equal(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-        })
-
-        // Create App
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("Create app").click({ force: true })
-        })
-
-        // Publish App & Verify it opened
-        cy.wait(2000) // Wait for app to generate
-        cy.publishApp(true)
-        cy.window().its('open').should('be.calledOnce')
-    })
-
-    xit("should filter tickets by status", () => {
-        // Visit published app
-        cy.visit(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-        cy.wait(1000)
-
-        // Tickets section
-        cy.get(".links").contains("Tickets").click({ force: true })
-        cy.wait(1000)
-
-        // Filter by stage - Confirm table updates
-        cy.get(".spectrum-Picker").contains("Filter by status").click({ force: true })
-        cy.get(".spectrum-Menu").find('li').its('length').then(len => {
-            for (let i = 1; i < len; i++) {
-                cy.get(".spectrum-Menu-item").eq(i).click()
-                const stage = cy.get(".spectrum-Picker-label")
-                stage.invoke('text').then(stageText => {
-                    if (stageText == "In progress" || stageText == "On hold" || stageText == "Triaged") {
-                        cy.get(".placeholder").should('contain', 'No rows found')
-                    }
-                    else {
-                        cy.get(".spectrum-Table-row").should('contain', stageText)
-                    }
-                    cy.get(".spectrum-Picker").contains(stageText).click({ force: true })
-                })
-            }
-        })
-    })
-    })
-})

packages/builder/cypress/integration/templates/adminPanels/adminPanelsTemplateDetails.spec.js

@@ -1,42 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Admin Panel Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Admin Panels Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Admin Panels"]').click()
-      })
-    })
-
-  it("should verify the details option for Admin Panels templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/approvalApps/approvalAppsTemplateDetails.spec.js

@@ -1,51 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Aproval Apps Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Approval Apps Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Approval Apps"]').click()
-      })
-    })
-
-  it("should verify the details option for Approval Apps templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            
-            if (templateNameText == "Content Approval System") {
-                // Template name should include 'content-approval'
-                const templateNameSplit = templateNameParsed.split('-system')[0]
-                cy.get('a')
-                .should('have.attr', 'href').and('contain', templateNameSplit)
-            }
-            else {
-                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-            }
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/businessApps/businessAppsTemplateDetails.spec.js

@@ -1,51 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Business Apps Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-      
-      // Filter Business Apps Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Business Apps"]').click()
-      })
-    })
-
-  it("should verify the details option for Business Apps templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            
-            if (templateNameText == "Employee Check-in/Check-Out Template") {
-                // Remove / from template name
-                const templateNameReplace = templateNameParsed.replace(/\//g, "-")
-                cy.get('a')
-                .should('have.attr', 'href').and('contain', templateNameReplace)
-            }
-            else {
-                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-            }
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/directories/directoriesTemplateDetails.spec.js

@@ -1,44 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Directories Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Directories Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Directories"]').click()
-      })
-    })
-
-  it("should verify the details option for Directories templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            const templateNameSplit = templateNameParsed.split('-template')[0]
-            cy.get('a')
-            .should('have.attr', 'href').and('contain', templateNameSplit)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/forms/formsTemplateDetails.spec.js

@@ -1,42 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Forms Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Forms Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Forms"]').click()
-      })
-    })
-
-  it("should verify the details option for Forms templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/healthcare/healthcareTemplateDetails.spec.js

@@ -1,43 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Healthcare Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Healthcare Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Healthcare"]').click()
-      })
-    })
-
-  it("should verify the details option for Healthcare templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/legal/legalTemplateDetails.spec.js

@@ -1,42 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Legal Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Legal Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Legal"]').click()
-      })
-    })
-
-  it("should verify the details option for Legal templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/logistics/logisticsTemplateDetails.spec.js

@@ -1,42 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Logistics Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Logistics Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Logistics"]').click()
-      })
-    })
-
-  it("should verify the details option for Logistics templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/manufacturing/manufacturingTemplateDetails.spec.js

@@ -1,42 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Manufacturing Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Manufacturing Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Manufacturing"]').click()
-      })
-    })
-
-  it("should verify the details option for Manufacturing templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/marketing/leadGenerationForm.spec.js

@@ -1,44 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Lead Generation Form Template Functionality", () => {
-    const templateName = "Lead Generation Form"
-    const templateNameParsed = templateName.toLowerCase().replace(/\s+/g, '-')
-    
-    before(() => {
-        cy.login()
-        cy.deleteApp(templateName)
-        // Template navigation
-        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`, {
-            onBeforeLoad(win) {
-                cy.stub(win, 'open')
-            }
-        })
-        cy.wait(2000)
-        })
-
-    it("should create and publish app with Lead Generation Form template", () => {
-        // Select Lead Generation Form template
-        cy.get(".template-thumbnail-text")
-            .contains(templateName).parentsUntil(".template-grid").within(() => {
-                cy.get(".spectrum-Button").contains("Use template").click({ force: true })
-            })
-
-        // Confirm URL matches template name
-        const appUrl = cy.get(".app-server")
-        appUrl.invoke('text').then(appUrlText => {
-            expect(appUrlText).to.equal(`${Cypress.config().baseUrl}/app/` + templateNameParsed)
-        })
-
-        // Create App
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("Create app").click({ force: true })
-        })
-
-        // Publish App & Verify it opened
-        cy.wait(2000) // Wait for app to generate
-        cy.publishApp(true)
-        cy.window().its('open').should('be.calledOnce')
-        })
-    })
-})

packages/builder/cypress/integration/templates/marketing/marketingTemplateDetails.spec.js

@@ -1,51 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Marketing Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Marketing Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Marketing"]').click()
-      })
-    })
-
-  it("should verify the details option for Marketing templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            
-            if (templateNameText == "Lead Generation Form") {
-                // Multi-step lead form
-                // Template name includes 'multi-step-lead-form'
-                cy.get('a')
-                .should('have.attr', 'href').and('contain', 'multi-step-lead-form')
-            }
-            else {
-                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-            }
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/operations/operationsTemplateDetails.spec.js

@@ -1,42 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Operations Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Operations Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Operations"]').click()
-      })
-    })
-
-  it("should verify the details option for Operations templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/portals/portalsTemplateDetails.spec.js

@@ -1,71 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Portals Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Portal Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Portal"]').click()
-    })
-    })
-
-  it("should verify the details option for Portal templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a')
-            .should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-
-  it("should verify the details option for Portals templates", () => {
-    // Filter Portals Templates
-    cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Portals"]').click()
-      })
-    
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a')
-            .should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/integration/templates/professionalServices/professionalServicesTemplateDetails.spec.js

@@ -1,42 +0,0 @@
-import filterTests from "../../../support/filterTests"
-
-filterTests(["all"], () => {
-  context("Verify Professional Services Template Details", () => {
-
-    before(() => {
-      cy.login()
-
-      // Template navigation
-      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
-
-      // Filter Professional Services Templates
-      cy.get(".template-category-filters").within(() => {
-        cy.get('[data-cy="Professional Services"]').click()
-      })
-    })
-
-  it("should verify the details option for Professional Services templates", () => {
-    cy.get(".template-grid").find(".template-card").its('length')
-    .then(len => {
-        // Verify template name is within details link
-      for (let i = 0; i < len; i++) {
-        cy.get(".template-card").eq(i).within(() => {
-          const templateName = cy.get(".template-thumbnail-text")
-          templateName.invoke('text')
-          .then(templateNameText => {
-            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
-            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
-          })
-          // Verify correct status from Details link - 200
-          cy.get('a')
-          .then(link => {
-            cy.request(link.prop('href'))
-            .its('status')
-            .should('eq', 200)
-          })
-        })
-      }
-    })
-  })
-})
-})

packages/builder/cypress/support/commands.js

@@ -1,14 +1,8 @@
-// ***********************************************
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-
 Cypress.on("uncaught:exception", () => {
   return false
 })
 
+// ACCOUNTS & USERS
 Cypress.Commands.add("login", () => {
   cy.visit(`${Cypress.config().baseUrl}/builder`)
   cy.wait(2000)
@@ -41,43 +35,20 @@ Cypress.Commands.add("logOut", () => {
   cy.wait(2000)
 })
 
-Cypress.Commands.add("closeModal", () => {
+Cypress.Commands.add("createUser", email => {
-  cy.get(".spectrum-Modal").within(() => {
+  // quick hacky recorded way to create a user
-    cy.get(".close-icon").click()
+  cy.contains("Users").click()
-    cy.wait(1000) // Wait for modal to close
+  cy.get(`[data-cy="add-user"]`).click()
-  })
+  cy.get(".spectrum-Picker-label").click()
-})
+  cy.get(".spectrum-Menu-item:nth-child(2) > .spectrum-Menu-itemLabel").click()
 
-Cypress.Commands.add("importApp", (exportFilePath, name) => {
+  //Onboarding type selector
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.get(
-
+    ":nth-child(2) > .spectrum-Form-itemField > .spectrum-Textfield > .spectrum-Textfield-input"
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+  )
-    .its("body")
+    .first()
-    .then(val => {
+    .type(email, { force: true })
-      if (val.length > 0) {
+  cy.get(".spectrum-Button--cta").click({ force: true })
-        cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
-        cy.wait(500)
-      }
-      cy.get(`[data-cy="import-app-btn"]`).click({ force: true })
-    })
-
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get("input").eq(1).should("have.focus")
-
-    cy.get(".spectrum-Dropzone").selectFile(exportFilePath, {
-      action: "drag-drop",
-    })
-
-    cy.get(".gallery .filename").contains("exported-app.txt")
-
-    if (name && name != "") {
-      cy.get("input").eq(0).type(name).should("have.value", name).blur()
-    }
-    cy.get(".confirm-wrap button")
-      .should("not.be.disabled")
-      .click({ force: true })
-    cy.wait(5000)
-  })
 })
 
 Cypress.Commands.add("updateUserInformation", (firstName, lastName) => {
@@ -113,6 +84,13 @@ Cypress.Commands.add("updateUserInformation", (firstName, lastName) => {
   })
 })
 
+// APPLICATIONS
+Cypress.Commands.add("createTestApp", () => {
+  const appName = "Cypress Tests"
+  cy.deleteApp(appName)
+  cy.createApp(appName, "This app is used for Cypress testing.")
+})
+
 Cypress.Commands.add("createApp", (name, addDefaultTable) => {
   const shouldCreateDefaultTable =
     typeof addDefaultTable != "boolean" ? true : addDefaultTable
@@ -218,57 +196,6 @@ Cypress.Commands.add("deleteAllApps", () => {
     })
 })
 
-Cypress.Commands.add("customiseAppIcon", () => {
-  // Select random icon
-  cy.get(".grid").within(() => {
-    cy.get(".icon-item")
-      .eq(Math.floor(Math.random() * 23) + 1)
-      .click()
-  })
-  // Select random colour
-  cy.get(".fill").click()
-  cy.get(".colors").within(() => {
-    cy.get(".color")
-      .eq(Math.floor(Math.random() * 33) + 1)
-      .click()
-  })
-  cy.intercept("**/applications/**").as("iconChange")
-  cy.get(".spectrum-Button").contains("Save").click({ force: true })
-  cy.wait("@iconChange")
-  cy.get("@iconChange").its("response.statusCode").should("eq", 200)
-  cy.wait(1000)
-})
-
-Cypress.Commands.add("alterAppVersion", (appId, version) => {
-  return cy
-    .request("put", `${Cypress.config().baseUrl}/api/applications/${appId}`, {
-      version: version || "0.0.1-alpha.0",
-    })
-    .then(resp => {
-      expect(resp.status).to.eq(200)
-    })
-})
-
-Cypress.Commands.add("updateAppName", (changedName, noName) => {
-  cy.get(".spectrum-Modal").within(() => {
-    if (noName == true) {
-      cy.get("input").clear()
-      cy.get(".spectrum-Dialog-grid")
-        .click()
-        .contains("App name must be letters, numbers and spaces only")
-      return cy
-    }
-    cy.get("input").clear()
-    cy.get("input")
-      .eq(0)
-      .type(changedName)
-      .should("have.value", changedName)
-      .blur()
-    cy.get(".spectrum-ButtonGroup").contains("Save").click({ force: true })
-    cy.wait(500)
-  })
-})
-
 Cypress.Commands.add("unlockApp", unlock_config => {
   let config = { ...unlock_config }
 
@@ -298,6 +225,26 @@ Cypress.Commands.add("unlockApp", unlock_config => {
     })
 })
 
+Cypress.Commands.add("updateAppName", (changedName, noName) => {
+  cy.get(".spectrum-Modal").within(() => {
+    if (noName == true) {
+      cy.get("input").clear()
+      cy.get(".spectrum-Dialog-grid")
+        .click()
+        .contains("App name must be letters, numbers and spaces only")
+      return cy
+    }
+    cy.get("input").clear()
+    cy.get("input")
+      .eq(0)
+      .type(changedName)
+      .should("have.value", changedName)
+      .blur()
+    cy.get(".spectrum-ButtonGroup").contains("Save").click({ force: true })
+    cy.wait(500)
+  })
+})
+
 Cypress.Commands.add("publishApp", resolvedAppPath => {
   //Assumes you have navigated to an application first
   cy.get(".toprightnav button.spectrum-Button")
@@ -321,34 +268,96 @@ Cypress.Commands.add("publishApp", resolvedAppPath => {
     })
 })
 
-Cypress.Commands.add("createTestApp", () => {
+Cypress.Commands.add("alterAppVersion", (appId, version) => {
-  const appName = "Cypress Tests"
+  return cy
-  cy.deleteApp(appName)
+    .request("put", `${Cypress.config().baseUrl}/api/applications/${appId}`, {
-  cy.createApp(appName, "This app is used for Cypress testing.")
+      version: version || "0.0.1-alpha.0",
-  //cy.createScreen("home")
+    })
+    .then(resp => {
+      expect(resp.status).to.eq(200)
+    })
 })
 
-Cypress.Commands.add("createTestTableWithData", () => {
+Cypress.Commands.add("importApp", (exportFilePath, name) => {
-  cy.createTable("dog")
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
-  cy.addColumn("dog", "name", "Text")
+
-  cy.addColumn("dog", "age", "Number")
+  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+    .its("body")
+    .then(val => {
+      if (val.length > 0) {
+        cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
+        cy.wait(500)
+      }
+      cy.get(`[data-cy="import-app-btn"]`).click({ force: true })
     })
 
-Cypress.Commands.add("publishApp", (viewApp = false) => {
+  cy.get(".spectrum-Modal").within(() => {
-  cy.get(".toprightnav").contains("Publish").click({ force: true })
+    cy.get("input").eq(1).should("have.focus")
-  cy.get(".spectrum-Dialog-grid").within(() => {
+
-    cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+    cy.get(".spectrum-Dropzone").selectFile(exportFilePath, {
+      action: "drag-drop",
     })
-  cy.wait(2000) // Wait for App to publish and modal to appear
+
-  cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".gallery .filename").contains("exported-app.txt")
-    if (viewApp) {
+
-      cy.get(".spectrum-Button").contains("View App").click({ force: true })
+    if (name && name != "") {
+      cy.get("input").eq(0).type(name).should("have.value", name).blur()
+    }
+    cy.get(".confirm-wrap button")
+      .should("not.be.disabled")
+      .click({ force: true })
+    cy.wait(5000)
+  })
+})
+
+// Filters visible with 1 or more
+Cypress.Commands.add("searchForApplication", appName => {
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.wait(2000)
+
+  // No app filter functionality if only 1 app exists
+  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+    .its("body")
+    .then(val => {
+      if (val.length < 2) {
+        return
       } else {
-      cy.get(".spectrum-Button").contains("Done").click({ force: true })
+        // Searches for the app
+        cy.get(".filter").then(() => {
+          cy.get(".spectrum-Textfield").within(() => {
+            cy.get("input").eq(0).clear()
+            cy.get("input").eq(0).type(appName)
+          })
+        })
       }
     })
 })
 
+// Assumes there are no others
+Cypress.Commands.add("applicationInAppTable", appName => {
+  cy.get(".appTable").within(() => {
+    cy.get(".title").contains(appName).should("exist")
+  })
+})
+
+Cypress.Commands.add("createAppFromScratch", appName => {
+  cy.get(`[data-cy="create-app-btn"]`)
+    .contains("Start from scratch")
+    .click({ force: true })
+  cy.get(".spectrum-Modal").within(() => {
+    cy.get("input")
+      .eq(0)
+      .clear()
+      .type(appName)
+      .should("have.value", appName)
+      .blur()
+    cy.get(".spectrum-ButtonGroup").contains("Create app").click()
+    cy.wait(10000)
+  })
+  cy.createTable("Cypress Tests", true)
+})
+
+// TABLES
 Cypress.Commands.add("createTable", (tableName, initialTable) => {
   if (!initialTable) {
     cy.navigateToDataSection()
@@ -369,6 +378,12 @@ Cypress.Commands.add("createTable", (tableName, initialTable) => {
   cy.contains(tableName).should("be.visible")
 })
 
+Cypress.Commands.add("createTestTableWithData", () => {
+  cy.createTable("dog")
+  cy.addColumn("dog", "name", "Text")
+  cy.addColumn("dog", "age", "Number")
+})
+
 Cypress.Commands.add(
   "addColumn",
   (tableName, columnName, type, multiOptions = null) => {
@@ -423,22 +438,33 @@ Cypress.Commands.add("addRowMultiValue", values => {
   })
 })
 
-Cypress.Commands.add("createUser", email => {
+Cypress.Commands.add("selectTable", tableName => {
-  // quick hacky recorded way to create a user
+  cy.expandBudibaseConnection()
-  cy.contains("Users").click()
+  cy.contains(".nav-item", tableName).click()
-  cy.get(`[data-cy="add-user"]`).click()
-  cy.get(".spectrum-Picker-label").click()
-  cy.get(".spectrum-Menu-item:nth-child(2) > .spectrum-Menu-itemLabel").click()
-
-  //Onboarding type selector
-  cy.get(
-    ":nth-child(2) > .spectrum-Form-itemField > .spectrum-Textfield > .spectrum-Textfield-input"
-  )
-    .first()
-    .type(email, { force: true })
-  cy.get(".spectrum-Button--cta").click({ force: true })
 })
 
+Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
+  cy.get(".spectrum-ActionButton")
+    .contains("Define Options")
+    .click()
+    .then(() => {
+      for (let i = 0; i < totalOptions; i++) {
+        // Add radio button options
+        cy.get(".spectrum-Button")
+          .contains("Add Option")
+          .click({ force: true })
+          .then(() => {
+            cy.wait(500)
+            cy.get("[placeholder='Label']").eq(i).type(i)
+            cy.get("[placeholder='Value']").eq(i).type(i)
+          })
+      }
+      // Save options
+      cy.get(".spectrum-Button").contains("Save").click({ force: true })
+    })
+})
+
+// DESIGN AREA
 Cypress.Commands.add("addComponent", (category, component) => {
   if (category) {
     cy.get(`[data-cy="category-${category}"]`).click({ force: true })
@@ -466,22 +492,8 @@ Cypress.Commands.add("getComponent", componentId => {
     .find(`[data-id=${componentId}]`)
 })
 
-Cypress.Commands.add("navigateToFrontend", () => {
-  // Clicks on Design tab and then the Home nav item
-  cy.wait(1000)
-  cy.contains("Design").click()
-  cy.get(".spectrum-Search").type("/")
-  cy.get(".nav-item").contains("home").click()
-})
-
-Cypress.Commands.add("navigateToDataSection", () => {
-  // Clicks on the Data tab
-  cy.wait(500)
-  cy.contains("Data").click()
-})
-
-//Blank
 Cypress.Commands.add("createScreen", (route, accessLevelLabel) => {
+  // Blank Screen
   cy.contains("Design").click()
   cy.get("[aria-label=AddCircle]").click()
   cy.get(".spectrum-Modal").within(() => {
@@ -541,17 +553,6 @@ Cypress.Commands.add(
   }
 )
 
-Cypress.Commands.add("navigateToAutogeneratedModal", () => {
-  // Screen name must already exist within data source
-  cy.contains("Design").click()
-  cy.get("[aria-label=AddCircle]").click()
-  cy.get(".spectrum-Modal").within(() => {
-    cy.get(".item").contains("Autogenerated screens").click()
-    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-    cy.wait(500)
-  })
-})
-
 Cypress.Commands.add(
   "createAutogeneratedScreens",
   (screenNames, accessLevelLabel) => {
@@ -573,96 +574,33 @@ Cypress.Commands.add(
   }
 )
 
-Cypress.Commands.add("addRow", values => {
+// NAVIGATION
-  cy.contains("Create row").click()
+Cypress.Commands.add("navigateToFrontend", () => {
-  cy.get(".spectrum-Modal").within(() => {
+  // Clicks on Design tab and then the Home nav item
-    for (let i = 0; i < values.length; i++) {
+  cy.wait(1000)
-      cy.get("input").eq(i).type(values[i]).blur()
+  cy.contains("Design").click()
-    }
+  cy.get(".spectrum-Search").type("/")
-    cy.get(".spectrum-ButtonGroup").contains("Create").click()
+  cy.get(".nav-item").contains("home").click()
-  })
 })
 
-Cypress.Commands.add("expandBudibaseConnection", () => {
+Cypress.Commands.add("navigateToDataSection", () => {
-  if (Cypress.$(".nav-item > .content > .opened").length === 0) {
+  // Clicks on the Data tab
-    // 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()
-})
-
-Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
-  cy.get(".spectrum-ActionButton")
-    .contains("Define Options")
-    .click()
-    .then(() => {
-      for (let i = 0; i < totalOptions; i++) {
-        // Add radio button options
-        cy.get(".spectrum-Button")
-          .contains("Add Option")
-          .click({ force: true })
-          .then(() => {
   cy.wait(500)
-            cy.get("[placeholder='Label']").eq(i).type(i)
+  cy.contains("Data").click()
-            cy.get("[placeholder='Value']").eq(i).type(i)
-          })
-      }
-      // Save options
-      cy.get(".spectrum-Button").contains("Save").click({ force: true })
-    })
 })
 
-//Filters visible with 1 or more
+Cypress.Commands.add("navigateToAutogeneratedModal", () => {
-Cypress.Commands.add("searchForApplication", appName => {
+  // Screen name must already exist within data source
-  cy.visit(`${Cypress.config().baseUrl}/builder`)
+  cy.contains("Design").click()
-  cy.wait(2000)
+  cy.get("[aria-label=AddCircle]").click()
-
-  // No app filter functionality if only 1 app exists
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-    .its("body")
-    .then(val => {
-      if (val.length < 2) {
-        return
-      } else {
-        // Searches for the app
-        cy.get(".filter").then(() => {
-          cy.get(".spectrum-Textfield").within(() => {
-            cy.get("input").eq(0).clear()
-            cy.get("input").eq(0).type(appName)
-          })
-        })
-      }
-    })
-})
-
-//Assumes there are no others
-Cypress.Commands.add("applicationInAppTable", appName => {
-  cy.get(".appTable").within(() => {
-    cy.get(".title").contains(appName).should("exist")
-  })
-})
-
-Cypress.Commands.add("createAppFromScratch", appName => {
-  cy.get(`[data-cy="create-app-btn"]`)
-    .contains("Start from scratch")
-    .click({ force: true })
   cy.get(".spectrum-Modal").within(() => {
-    cy.get("input")
+    cy.get(".item").contains("Autogenerated screens").click()
-      .eq(0)
+    cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-      .clear()
+    cy.wait(500)
-      .type(appName)
-      .should("have.value", appName)
-      .blur()
-    cy.get(".spectrum-ButtonGroup").contains("Create app").click()
-    cy.wait(10000)
   })
-  cy.createTable("Cypress Tests", true)
 })
 
+// DATASOURCES
 Cypress.Commands.add("selectExternalDatasource", datasourceName => {
   // Navigates to Data Section
   cy.navigateToDataSection()
@@ -798,3 +736,18 @@ Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => {
     .should("contain", method)
     .and("contain", queryPrettyName)
 })
+
+// MISC
+Cypress.Commands.add("closeModal", () => {
+  cy.get(".spectrum-Modal").within(() => {
+    cy.get(".close-icon").click()
+    cy.wait(1000) // Wait for modal to close
+  })
+})
+
+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()
+  }
+})