Merge pull request #5978 from Budibase/cypress-testing

Lead Generation Form Template Test + Refactor

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter HR Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -8,13 +8,13 @@ filterTests(["all"], () => {
     before(() => {
         cy.login()
         cy.deleteApp(templateName)
-        cy.visit(`${Cypress.config().baseUrl}/builder`, {
+        // Template navigation
+        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`, {
             onBeforeLoad(win) {
                 cy.stub(win, 'open')
             }
         })
         cy.wait(2000)
-        cy.templateNavigation()
         })
 
     it("should create and publish app with Job Application Tracker template", () => {
@@ -35,20 +35,11 @@ filterTests(["all"], () => {
             cy.get(".spectrum-Button").contains("Create app").click({ force: true })
         })
 
-        // Publish App
+        // Publish App & Verify it opened
         cy.wait(2000) // Wait for app to generate
-        cy.get(".toprightnav").contains("Publish").click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("Publish").click({ force: true })
-        })
-
-        // Verify Published app
-        cy.wait(2000) // Wait for App to publish and modal to appear
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("View App").click({ force: true })
+        cy.publishApp(true)
         cy.window().its('open').should('be.calledOnce')
     })
-    })
 
     it("should add active/inactive vacancies", () => {
         // Visit published app

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter IT Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -8,13 +8,13 @@ filterTests(["all"], () => {
     before(() => {
         cy.login()
         cy.deleteApp(templateName)
-        cy.visit(`${Cypress.config().baseUrl}/builder`, {
+        // Template navigation
+        cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`, {
             onBeforeLoad(win) {
                 cy.stub(win, 'open')
             }
         })
         cy.wait(2000)
-        cy.templateNavigation()
         })
 
     it("should create and publish app with IT Ticketing System template", () => {
@@ -35,20 +35,11 @@ filterTests(["all"], () => {
             cy.get(".spectrum-Button").contains("Create app").click({ force: true })
         })
 
-        // Publish App
+        // Publish App & Verify it opened
         cy.wait(2000) // Wait for app to generate
-        cy.get(".toprightnav").contains("Publish").click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("Publish").click({ force: true })
-        })
-
-        // Verify Published app
-        cy.wait(2000) // Wait for App to publish and modal to appear
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Button").contains("View App").click({ force: true })
+        cy.publishApp(true)
         cy.window().its('open').should('be.calledOnce')
     })
-    })
 
     xit("should filter tickets by status", () => {
         // Visit published app

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Admin Panels Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Approval Apps Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
       
       // Filter Business Apps Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Directories Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Forms Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Healthcare Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Legal Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Logistics Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Manufacturing Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -0,0 +1,44 @@
+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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Marketing Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Operations Templates
       cy.get(".template-category-filters").within(() => {

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

@@ -7,21 +7,15 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
-    })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
-  it("should verify the details option for Portal 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++) {

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

@@ -7,13 +7,7 @@ filterTests(["all"], () => {
       cy.login()
 
       // Template navigation
-      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-      .its("body")
-      .then(val => {
-        if (val.length > 0) {
-          cy.get(".spectrum-Button").contains("Templates").click({force: true})
-        }
-      })
+      cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/templates`)
 
       // Filter Professional Services Templates
       cy.get(".template-category-filters").within(() => {

packages/builder/cypress/support/commands.js

@@ -35,7 +35,7 @@ Cypress.Commands.add("login", () => {
 Cypress.Commands.add("closeModal", () => {
   cy.get(".spectrum-Modal").within(() => {
     cy.get(".close-icon").click()
-    cy.wait(500)
+    cy.wait(1000) // Wait for modal to close
   })
 })
 
@@ -222,6 +222,21 @@ Cypress.Commands.add("createTestTableWithData", () => {
   cy.addColumn("dog", "age", "Number")
 })
 
+Cypress.Commands.add("publishApp", (viewApp = false) => {
+  cy.get(".toprightnav").contains("Publish").click({ force: true })
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+  })
+  cy.wait(2000) // Wait for App to publish and modal to appear
+  cy.get(".spectrum-Dialog-grid").within(() => {
+    if (viewApp) {
+      cy.get(".spectrum-Button").contains("View App").click({ force: true })
+    } else {
+      cy.get(".spectrum-Button").contains("Done").click({ force: true })
+    }
+  })
+})
+
 Cypress.Commands.add("createTable", (tableName, initialTable) => {
   if (!initialTable) {
     cy.navigateToDataSection()
@@ -671,15 +686,3 @@ Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => {
     .should("contain", method)
     .and("contain", queryPrettyName)
 })
-
-Cypress.Commands.add("templateNavigation", () => {
-  // Navigates to templates section
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-    .its("body")
-    .then(val => {
-      // Templates button needs clicked if apps already exist
-      if (val.length > 0) {
-        cy.get(".spectrum-Button").contains("Templates").click({ force: true })
-      }
-    })
-})