Merge pull request #5206 from Budibase/cypress-testing

Updating tests to work with test Env

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

@@ -6,10 +6,6 @@ filterTests(['all'], () => {
         cy.login()
       })
 
-      after(() => {
-        cy.deleteAllApps()
-      })
-      
       it("should change the icon and colour for an application", () => {
           // Search for test application
           cy.applicationInAppTable("Cypress Tests")

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

@@ -3,25 +3,32 @@ import filterTests from '../support/filterTests'
 filterTests(['smoke', 'all'], () => {
   context("Create an Application", () => {
 
-    beforeEach(() => {
+    before(() => {
       cy.login()
+      cy.deleteApp("Cypress Tests")
     })
 
-    it("should show the new user UI/UX", () => {
+    if (!(Cypress.env("TEST_ENV"))) {
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      it("should show the new user UI/UX", () => {
-      cy.get(`[data-cy="create-app-btn"]`).contains('Start from scratch').should("exist")
+        cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.get(`[data-cy="import-app-btn"]`).should("exist")
+        cy.get(`[data-cy="create-app-btn"]`).contains('Start from scratch').should("exist")
+        cy.get(`[data-cy="import-app-btn"]`).should("exist")
         
-      cy.get(".template-category-filters").should("exist")
+        cy.get(".template-category-filters").should("exist")
-      cy.get(".template-categories").should("exist")
+        cy.get(".template-categories").should("exist")
         
-      cy.get(".appTable").should("not.exist")
+        cy.get(".appTable").should("not.exist")
-    })
+      })
+    }
 
     it("should provide filterable templates", () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
 
+      if (Cypress.env("TEST_ENV")) {
+        cy.get(".spectrum-Button").contains("Templates").click({force: true})
+      }
+
       cy.get(".template-category-filters").should("exist")
       cy.get(".template-categories").should("exist")
       
@@ -39,14 +46,22 @@ filterTests(['smoke', 'all'], () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
 
-      const appName = "A New App"
+      // Start create app process. If apps already exist, click second button
+      cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
+      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.get(`[data-cy="create-app-btn"]`).contains('Start from scratch').click({force: true})
+      const appName = "Cypress Tests"
       cy.get(".spectrum-Modal").within(() => {
 
         //Auto fill
         cy.get("input").eq(0).type(appName).should("have.value", appName).blur()
-        cy.get("input").eq(1).should("have.value", "/a-new-app")
+        cy.get("input").eq(1).should("have.value", "/cypress-tests")
         cy.get(".spectrum-ButtonGroup").contains("Create app").should('not.be.disabled')
 
         //Empty the app url - disabled create
@@ -69,8 +84,7 @@ filterTests(['smoke', 'all'], () => {
 
     it("should create the first application from scratch", () => {
       const appName = "Cypress Tests"
-      cy.deleteApp(appName)
+      cy.createApp(appName)
-      cy.createApp(appName, "This app is used for Cypress testing.")
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(1000)
@@ -83,10 +97,19 @@ filterTests(['smoke', 'all'], () => {
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
 
+      // Navigate to Create new app section if apps already exist
+      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.get(".template-category-filters").should("exist")
       cy.get(".template-categories").should("exist")
 
-      //### Select nth template and choose to create?
+      // Select template
       cy.get('.template-category').eq(0).within(() => {
         const card = cy.get('.template-card').eq(0).should("exist");
         const cardOverlay = card.get('.template-thumbnail-action-overlay').should("exist")
@@ -94,7 +117,7 @@ filterTests(['smoke', 'all'], () => {
         cardOverlay.get("button").contains("Use template").should("exist").click({force: true})
       })
 
-      //### CMD Create app from theme card
+      // CMD Create app from theme card
       cy.get(".spectrum-Modal").should('be.visible')
       
       const templateName = cy.get(".spectrum-Modal .template-thumbnail-text")
@@ -111,27 +134,22 @@ filterTests(['smoke', 'all'], () => {
         cy.wait(1000)
 
         cy.applicationInAppTable(templateNameText)
-        cy.deleteAllApps() 
+        cy.deleteApp(templateNameText) 
       });
 
     })
 
     it("should display a second application and app filtering", () => {
+      // Create first app
       const appName = "Cypress Tests"
-      cy.deleteApp(appName)
+      cy.createApp(appName)
-      cy.createApp(appName, "This app is used for Cypress testing.")
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
 
+      // Create second app
       const secondAppName = "Second App Demo"
-      cy.deleteApp(secondAppName)
+      cy.createApp(secondAppName)
-
-      cy.get(`[data-cy="create-app-btn"]`).contains('Create new app').click({force: true})
-      cy.wait(500)
-      cy.url().should('include', '/builder/portal/apps/create')
-
-      cy.createAppFromScratch(secondAppName)
 
       cy.visit(`${Cypress.config().baseUrl}/builder`)
       cy.wait(500)
@@ -140,7 +158,7 @@ filterTests(['smoke', 'all'], () => {
       cy.searchForApplication(appName)
       cy.searchForApplication(secondAppName)
 
-      cy.deleteAllApps()
+      cy.deleteApp(secondAppName)
     })
 
   })  

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

@@ -7,10 +7,6 @@ filterTests(["smoke", "all"], () => {
       cy.createTestApp()
     })
 
-    after(() => {
-      cy.deleteAllApps()
-    })
-
     it("should create a new Table", () => {
       cy.createTable("dog")
       cy.wait(1000)

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

@@ -4,9 +4,6 @@ filterTests(["smoke", "all"], () => {
   context("Create a User and Assign Roles", () => {
     before(() => {
       cy.login()
-      cy.visit(`${Cypress.config().baseUrl}/builder`)
-      cy.wait(500)
-      cy.createAppFromScratch("Initial App")
     })
 
     it("should create a user", () => {

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

@@ -4,7 +4,6 @@ filterTests(['smoke', 'all'], () => {
   context("Create a View", () => {
     before(() => {
       cy.login()
-      cy.deleteAllApps()
 
       cy.createTestApp()
       cy.createTable("data")

packages/builder/cypress/integration/datasources/rest.spec.js

@@ -4,7 +4,6 @@ filterTests(["smoke", "all"], () => {
   context("REST Datasource Testing", () => {
     before(() => {
       cy.login()
-      cy.deleteAllApps()
       cy.createTestApp()
     })
 

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

@@ -4,8 +4,7 @@ filterTests(["smoke", "all"], () => {
   context("Query Level Transformers", () => {
     before(() => {
       cy.login()
-      cy.deleteAllApps()
+      cy.createTestApp()
-      cy.createApp("Cypress Tests")
     })
 
     it("should write a transformer function", () => {

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

@@ -11,10 +11,12 @@ filterTests(['all'], () => {
       const appName = "Cypress Tests"
       const appRename = "Cypress Renamed"
       // Rename app, Search for app, Confirm name was changed
-      cy.get(".home-logo").click()
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.wait(500)
       renameApp(appName, appRename)
       cy.reload()
       cy.wait(1000)
+      cy.searchForApplication(appRename)
       cy.get(".appTable").find(".title").should("have.length", 1)
       cy.applicationInAppTable(appRename)
       // Set app name back to Cypress Tests
@@ -36,7 +38,8 @@ filterTests(['all'], () => {
           cy.get(".spectrum-Button").contains("Publish").click({ force: true })
         })
       // Rename app, Search for app, Confirm name was changed
-      cy.get(".home-logo").click()
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.wait(500)
       renameApp(appName, appRename, true)
       cy.get(".appTable").find(".wrapper").should("have.length", 1)
       cy.applicationInAppTable(appRename)
@@ -44,7 +47,8 @@ filterTests(['all'], () => {
 
     it("Should try to rename an application to have no name", () => {
       const appName = "Cypress Tests"
-      cy.get(".home-logo").click()
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.wait(500)
       renameApp(appName, " ", false, true)
       cy.wait(500)
       // Close modal and confirm name has not been changed
@@ -52,8 +56,6 @@ filterTests(['all'], () => {
       cy.reload()
       cy.wait(1000)
       cy.applicationInAppTable(appName)
-      cy.get(".appTable").find(".title").should("have.length", 1)
-
     })
 
     xit("Should create two applications with the same name", () => {
@@ -77,12 +79,12 @@ filterTests(['all'], () => {
       const appName = "Cypress Tests"
       const numberName = 12345
       const specialCharName = "£$%^"
-      cy.get(".home-logo").click()
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.wait(500)
       renameApp(appName, numberName)
       cy.reload()
       cy.wait(1000)
       cy.applicationInAppTable(numberName)
-      cy.get(".appTable").find(".title").should("have.length", 1)
       cy.reload()
       cy.wait(1000)
       renameApp(numberName, specialCharName)
@@ -94,40 +96,33 @@ filterTests(['all'], () => {
     })
 
     const renameApp = (originalName, changedName, published, noName) => {
-      cy.applicationInAppTable(originalName)
+      cy.searchForApplication(originalName)
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      cy.get(".appTable")
-        .its("body")
+        .within(() => {
-        .then(val => {
+          cy.get(".spectrum-Icon").eq(1).click()
-          if (val.length > 0) {
+          })
-            cy.get(".appTable")
+        // Check for when an app is published
-              .within(() => {
+        if (published == true) {
-                cy.get(".spectrum-Icon").eq(1).click()
+          // Should not have Edit as option, will unpublish app
-              })
+          cy.should("not.have.value", "Edit")
-            // Check for when an app is published
+          cy.get(".spectrum-Menu").contains("Unpublish").click()
-            if (published == true) {
+          cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
-              // Should not have Edit as option, will unpublish app
+          cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
-              cy.should("not.have.value", "Edit")
+        }
-              cy.get(".spectrum-Menu").contains("Unpublish").click()
+        cy.contains("Edit").click()
-              cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+        cy.get(".spectrum-Modal")
-              cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
+          .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.contains("Edit").click()
+            cy.get("input").clear()
-            cy.get(".spectrum-Modal")
+            cy.get("input").eq(0).type(changedName).should("have.value", changedName).blur()
-              .within(() => {
+            cy.get(".spectrum-ButtonGroup").contains("Save").click({ force: true })
-                if (noName == true) {
+            cy.wait(500)
-                  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)
-              })
-          }
-        })
-
-    }
-  })
 })

packages/builder/cypress/support/commands.js

@@ -35,9 +35,17 @@ Cypress.Commands.add("login", () => {
 Cypress.Commands.add("createApp", name => {
   cy.visit(`${Cypress.config().baseUrl}/builder`)
   cy.wait(500)
-
   cy.get(`[data-cy="create-app-btn"]`).click({ force: true })
 
+  // If apps already exist
+  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.get(".spectrum-Modal").within(() => {
     cy.get("input").eq(0).type(name).should("have.value", name).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create app").click()
@@ -53,23 +61,30 @@ Cypress.Commands.add("deleteApp", name => {
     .its("body")
     .then(val => {
       if (val.length > 0) {
-        const appId = val.reduce((acc, app) => {
+        if (Cypress.env("TEST_ENV")) {
-          if (name === app.name) {
+          cy.searchForApplication(name)
-            acc = app.appId
+          cy.get(".appTable").within(() => {
+            cy.get(".spectrum-Icon").eq(1).click()
+          })
+        } else {
+          const appId = val.reduce((acc, app) => {
+            if (name === app.name) {
+              acc = app.appId
+            }
+            return acc
+          }, "")
+
+          if (appId == "") {
+            return
           }
-          return acc
-        }, "")
 
-        if (appId == "") {
+          const appIdParsed = appId.split("_").pop()
-          return
+          const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
+          cy.get(actionEleId).within(() => {
+            cy.get(".spectrum-Icon").eq(0).click()
+          })
         }
 
-        const appIdParsed = appId.split("_").pop()
-        const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
-        cy.get(actionEleId).within(() => {
-          cy.get(".spectrum-Icon").eq(0).click()
-        })
-
         cy.get(".spectrum-Menu").then($menu => {
           if ($menu.text().includes("Unpublish")) {
             cy.get(".spectrum-Menu").contains("Unpublish").click()
@@ -327,16 +342,25 @@ Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
 
 //Filters visible with 1 or more
 Cypress.Commands.add("searchForApplication", appName => {
-  cy.wait(1000)
+  cy.visit(`${Cypress.config().baseUrl}/builder`)
-  // Searches for the app
+  cy.wait(2000)
-  cy.get(".filter").then(() => {
+
-    cy.get(".spectrum-Textfield").within(() => {
+  // No app filter functionality if only 1 app exists
-      cy.get("input").eq(0).clear()
+  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      cy.get("input").eq(0).type(appName)
+    .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)
+          })
+        })
+      }
     })
-  })
-  // Confirms app exists after search
-  cy.applicationInAppTable(appName)
 })
 
 //Assumes there are no others