From a6c7b6ab2638555c71b4d401efd23b97f73425ce Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 19 May 2022 15:23:53 +0100 Subject: [PATCH] Template Testing Refactor Directly visiting the templates URL --- .../templates/HR/hrTemplateDetails.spec.js | 8 +------- .../templates/HR/jobApplicationTracker.spec.js | 4 ++-- .../templates/IT/ITTemplateDetails.spec.js | 8 +------- .../templates/IT/ITTicketingSystem.spec.js | 4 ++-- .../adminPanelsTemplateDetails.spec.js | 8 +------- .../approvalAppsTemplateDetails.spec.js | 8 +------- .../businessAppsTemplateDetails.spec.js | 10 ++-------- .../directoriesTemplateDetails.spec.js | 8 +------- .../forms/formsTemplateDetails.spec.js | 8 +------- .../healthcareTemplateDetails.spec.js | 8 +------- .../legal/legalTemplateDetails.spec.js | 8 +------- .../logistics/logisticsTemplateDetails.spec.js | 8 +------- .../manufacturingTemplateDetails.spec.js | 8 +------- .../marketing/marketingTemplateDetails.spec.js | 8 +------- .../operationsTemplateDetails.spec.js | 8 +------- .../portals/portalsTemplateDetails.spec.js | 18 ++++++------------ ...professionalServicesTemplateDetails.spec.js | 8 +------- packages/builder/cypress/support/commands.js | 12 ------------ 18 files changed, 25 insertions(+), 127 deletions(-) diff --git a/packages/builder/cypress/integration/templates/HR/hrTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/HR/hrTemplateDetails.spec.js index 9a00645ced..fbac463bfe 100644 --- a/packages/builder/cypress/integration/templates/HR/hrTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/HR/jobApplicationTracker.spec.js b/packages/builder/cypress/integration/templates/HR/jobApplicationTracker.spec.js index ff6cb91bad..3bfbd43738 100644 --- a/packages/builder/cypress/integration/templates/HR/jobApplicationTracker.spec.js +++ b/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", () => { diff --git a/packages/builder/cypress/integration/templates/IT/ITTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/IT/ITTemplateDetails.spec.js index baebeef60a..84cbc5707e 100644 --- a/packages/builder/cypress/integration/templates/IT/ITTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/IT/ITTicketingSystem.spec.js b/packages/builder/cypress/integration/templates/IT/ITTicketingSystem.spec.js index 118625ac65..37f412205e 100644 --- a/packages/builder/cypress/integration/templates/IT/ITTicketingSystem.spec.js +++ b/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", () => { diff --git a/packages/builder/cypress/integration/templates/adminPanels/adminPanelsTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/adminPanels/adminPanelsTemplateDetails.spec.js index 8c76a01126..2fa57b2c89 100644 --- a/packages/builder/cypress/integration/templates/adminPanels/adminPanelsTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/approvalApps/approvalAppsTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/approvalApps/approvalAppsTemplateDetails.spec.js index 8fa0d61390..322a17f6c2 100644 --- a/packages/builder/cypress/integration/templates/approvalApps/approvalAppsTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/businessApps/businessAppsTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/businessApps/businessAppsTemplateDetails.spec.js index 643c854168..734fb9a968 100644 --- a/packages/builder/cypress/integration/templates/businessApps/businessAppsTemplateDetails.spec.js +++ b/packages/builder/cypress/integration/templates/businessApps/businessAppsTemplateDetails.spec.js @@ -7,14 +7,8 @@ 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(() => { cy.get('[data-cy="Business Apps"]').click() diff --git a/packages/builder/cypress/integration/templates/directories/directoriesTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/directories/directoriesTemplateDetails.spec.js index d763dab9e7..dc874fcbaf 100644 --- a/packages/builder/cypress/integration/templates/directories/directoriesTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/forms/formsTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/forms/formsTemplateDetails.spec.js index a8cb30da85..3206a71f6e 100644 --- a/packages/builder/cypress/integration/templates/forms/formsTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/healthcare/healthcareTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/healthcare/healthcareTemplateDetails.spec.js index 02b8c7694e..b46bb46274 100644 --- a/packages/builder/cypress/integration/templates/healthcare/healthcareTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/legal/legalTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/legal/legalTemplateDetails.spec.js index 16715bb5d6..57485aee40 100644 --- a/packages/builder/cypress/integration/templates/legal/legalTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/logistics/logisticsTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/logistics/logisticsTemplateDetails.spec.js index a56cc80a67..e5d5745e4e 100644 --- a/packages/builder/cypress/integration/templates/logistics/logisticsTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/manufacturing/manufacturingTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/manufacturing/manufacturingTemplateDetails.spec.js index b2809d78ee..30019c87fd 100644 --- a/packages/builder/cypress/integration/templates/manufacturing/manufacturingTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/marketing/marketingTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/marketing/marketingTemplateDetails.spec.js index 2c8840f321..66875e6939 100644 --- a/packages/builder/cypress/integration/templates/marketing/marketingTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/operations/operationsTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/operations/operationsTemplateDetails.spec.js index 2665de9e81..1a2ee1703a 100644 --- a/packages/builder/cypress/integration/templates/operations/operationsTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/integration/templates/portals/portalsTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/portals/portalsTemplateDetails.spec.js index 5e26948180..e81e12318d 100644 --- a/packages/builder/cypress/integration/templates/portals/portalsTemplateDetails.spec.js +++ b/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`) + + // Filter Portal Templates + cy.get(".template-category-filters").within(() => { + cy.get('[data-cy="Portal"]').click() + }) }) it("should verify the details option for Portal templates", () => { - // Filter Portal Templates - cy.get(".template-category-filters").within(() => { - cy.get('[data-cy="Portal"]').click() - }) - cy.get(".template-grid").find(".template-card").its('length') .then(len => { for (let i = 0; i < len; i++) { diff --git a/packages/builder/cypress/integration/templates/professionalServices/professionalServicesTemplateDetails.spec.js b/packages/builder/cypress/integration/templates/professionalServices/professionalServicesTemplateDetails.spec.js index e8ed18a19c..1267d8bd5c 100644 --- a/packages/builder/cypress/integration/templates/professionalServices/professionalServicesTemplateDetails.spec.js +++ b/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(() => { diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 6655219cd7..4295860dc1 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -671,15 +671,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 }) - } - }) -})