Adding tags to tests

Currently there is 'smoke' and 'all' tags

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

@@ -1,14 +1,17 @@
-context("Add Multi-Option Datatype", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-  })
 
-  it("should create a new table, with data", () => {
+filterTests(['all'], () => {
-    cy.createTable("Multi Data")
+  context("Add Multi-Option Datatype", () => {
-    cy.addColumn("Multi Data", "Test Data", "Multi-select", "1\n2\n3\n4\n5")
+    before(() => {
-    cy.addRowMultiValue(["1", "2", "3", "4", "5"])
+      cy.login()
-  })
+      cy.createTestApp()
+    })
+
+    it("should create a new table, with data", () => {
+      cy.createTable("Multi Data")
+      cy.addColumn("Multi Data", "Test Data", "Multi-select", "1\n2\n3\n4\n5")
+      cy.addRowMultiValue(["1", "2", "3", "4", "5"])
+    })
 
     it ("should add form with multi select picker, containing 5 options", () => {
         cy.navigateToFrontend()
@@ -39,4 +42,4 @@ context("Add Multi-Option Datatype", () => {
         })
     })
   })
-
+})

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

@@ -1,35 +1,39 @@
-context("Add Radio Buttons", () => {
+import filterTests from "../support/filterTests"
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
 
-it("should add Radio Buttons options picker on form, add data, and confirm", () => {
+filterTests(['all'], () => {
-    cy.navigateToFrontend()
+    context("Add Radio Buttons", () => {
-    cy.addComponent("Form", "Form")
+        before(() => {
-    cy.addComponent("Form", "Options Picker").then((componentId) => {
+        cy.login()
-        // Provide field setting
+        cy.createTestApp()
-    cy.get(`[data-cy="field-prop-control"]`).type("1")
-    // Open dropdown and select Radio buttons
-    cy.get(`[data-cy="optionsType-prop-control"]`).click().then(() => {
-        cy.get('.spectrum-Popover').contains('Radio buttons')
-        .wait(500)
-        .click()
         })
-    const radioButtonsTotal = 3
-    // Add values and confirm total
-    addRadioButtonData(radioButtonsTotal)
-    cy.getComponent(componentId).find('[type="radio"]')
-    .should('have.length', radioButtonsTotal)
-        })
-    })
 
-    const addRadioButtonData = (totalRadioButtons) => {
+    it("should add Radio Buttons options picker on form, add data, and confirm", () => {
-        cy.get(`[data-cy="optionsSource-prop-control"]`).click().then(() => {
+        cy.navigateToFrontend()
-            cy.get('.spectrum-Popover').contains('Custom')
+        cy.addComponent("Form", "Form")
+        cy.addComponent("Form", "Options Picker").then((componentId) => {
+            // Provide field setting
+        cy.get(`[data-cy="field-prop-control"]`).type("1")
+        // Open dropdown and select Radio buttons
+        cy.get(`[data-cy="optionsType-prop-control"]`).click().then(() => {
+            cy.get('.spectrum-Popover').contains('Radio buttons')
             .wait(500)
             .click()
+            })
+        const radioButtonsTotal = 3
+        // Add values and confirm total
+        addRadioButtonData(radioButtonsTotal)
+        cy.getComponent(componentId).find('[type="radio"]')
+        .should('have.length', radioButtonsTotal)
+            })
         })
-        cy.addCustomSourceOptions(totalRadioButtons)
+        
-    }
+        const addRadioButtonData = (totalRadioButtons) => {
+            cy.get(`[data-cy="optionsSource-prop-control"]`).click().then(() => {
+                cy.get('.spectrum-Popover').contains('Custom')
+                .wait(500)
+                .click()
+            })
+            cy.addCustomSourceOptions(totalRadioButtons)
+        }
+    })
 })

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

@@ -1,47 +1,51 @@
-context("Auto Screens UI", () => {
+import filterTests from "../support/filterTests"
-    before(() => {
-    cy.login()
-    cy.createTestApp()
-    })
 
-    it("should generate internal table screens", () => {
+filterTests(['smoke', 'all'], () => {
-        // Create autogenerated screens from the internal table
+    context("Auto Screens UI", () => {
-        cy.createAutogeneratedScreens(["Cypress Tests"])
+        before(() => {
-        // Confirm screens have been auto generated
+        cy.login()
-        cy.get(".nav-items-container").contains("cypress-tests").click()
+        cy.createTestApp()
-        cy.get(".nav-items-container").should('contain', 'cypress-tests/:id')
-        .and('contain', 'cypress-tests/new/row')
-    })
-    
-    it("should generate multiple internal table screens at once", () => {
-        // Create a second internal table
-        const initialTable = "Cypress Tests"
-        const secondTable = "Table Two"
-        cy.createTable(secondTable)
-        // Create autogenerated screens from the internal tables
-        cy.createAutogeneratedScreens([initialTable, secondTable])
-        // Confirm screens have been auto generated
-        cy.get(".nav-items-container").contains("cypress-tests").click()
-        // Previously generated tables are suffixed with numbers - as expected
-        cy.get(".nav-items-container").should('contain', 'cypress-tests-2/:id')
-        .and('contain', 'cypress-tests-2/new/row')
-        cy.get(".nav-items-container").contains("table-two").click()
-        cy.get(".nav-items-container").should('contain', 'table-two/:id')
-        .and('contain', 'table-two/new/row')
-    })
-    
-    if (Cypress.env("TEST_ENV")) {
-        it("should generate data source screens", () => {
-            // Using MySQL data source for testing this
-            const datasource = "MySQL"
-            // Select & configure MySQL data source
-            cy.selectExternalDatasource(datasource)
-            cy.addDatasourceConfig(datasource)
-            // Create autogenerated screens from a MySQL table - MySQL contains books table
-            cy.createAutogeneratedScreens(["books"])
-            cy.get(".nav-items-container").contains("books").click()
-            cy.get(".nav-items-container").should('contain', 'books/:id')
-            .and('contain', 'books/new/row')
         })
-    }
+        
+        it("should generate internal table screens", () => {
+            // Create autogenerated screens from the internal table
+            cy.createAutogeneratedScreens(["Cypress Tests"])
+            // Confirm screens have been auto generated
+            cy.get(".nav-items-container").contains("cypress-tests").click()
+            cy.get(".nav-items-container").should('contain', 'cypress-tests/:id')
+            .and('contain', 'cypress-tests/new/row')
+        })
+        
+        it("should generate multiple internal table screens at once", () => {
+            // Create a second internal table
+            const initialTable = "Cypress Tests"
+            const secondTable = "Table Two"
+            cy.createTable(secondTable)
+            // Create autogenerated screens from the internal tables
+            cy.createAutogeneratedScreens([initialTable, secondTable])
+            // Confirm screens have been auto generated
+            cy.get(".nav-items-container").contains("cypress-tests").click()
+            // Previously generated tables are suffixed with numbers - as expected
+            cy.get(".nav-items-container").should('contain', 'cypress-tests-2/:id')
+            .and('contain', 'cypress-tests-2/new/row')
+            cy.get(".nav-items-container").contains("table-two").click()
+            cy.get(".nav-items-container").should('contain', 'table-two/:id')
+            .and('contain', 'table-two/new/row')
+        })
+        
+        if (Cypress.env("TEST_ENV")) {
+            it("should generate data source screens", () => {
+                // Using MySQL data source for testing this
+                const datasource = "MySQL"
+                // Select & configure MySQL data source
+                cy.selectExternalDatasource(datasource)
+                cy.addDatasourceConfig(datasource)
+                // Create autogenerated screens from a MySQL table - MySQL contains books table
+                cy.createAutogeneratedScreens(["books"])
+                cy.get(".nav-items-container").contains("books").click()
+                cy.get(".nav-items-container").should('contain', 'books/:id')
+                .and('contain', 'books/new/row')
+            })
+        }
+    })
 })

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

@@ -1,39 +1,43 @@
-context("Change Application Icon and Colour", () => {
+import filterTests from "../support/filterTests"
-    before(() => {
-      cy.login()
-    })
 
-    it("should change the icon and colour for an application", () => {
+filterTests(['all'], () => {
-        // Search for test application
+  context("Change Application Icon and Colour", () => {
-        cy.searchForApplication("Cypress Tests")
+      before(() => {
-        cy.get(".appTable")
+        cy.login()
-          .within(() => {
+      })
-            cy.get(".spectrum-Icon").eq(1).click()
+      
+      it("should change the icon and colour for an application", () => {
+          // Search for test application
+          cy.searchForApplication("Cypress Tests")
+          cy.get(".appTable")
+            .within(() => {
+              cy.get(".spectrum-Icon").eq(1).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()
           })
-        cy.get(".spectrum-Menu").contains("Edit icon").click()
+          // Select random colour
-        // Select random icon
+          cy.get(".fill").click()
-        cy.get(".grid").within(() => {
+          cy.get(".colors").within(() => {
-            cy.get(".icon-item").eq(Math.floor(Math.random() * 23) + 1).click()
+              cy.get(".color").eq(Math.floor(Math.random() * 33) + 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.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')
+            })
+      })
+  })
 })

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

@@ -1,8 +1,12 @@
-context("Create an Application", () => {
+import filterTests from '../support/filterTests'
-  it("should create a new application", () => {
+
-    cy.login()
+filterTests(['smoke', 'all'], () => {
-    cy.createTestApp()
+  context("Create an Application", () => {
-    cy.visit(`${Cypress.config().baseUrl}/builder`)
+    it("should create a new application", () => {
-    cy.contains("Cypress Tests").should("exist")
+      cy.login()
+      cy.createTestApp()
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
+      cy.contains("Cypress Tests").should("exist")
+    })
   })  
 })

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

@@ -1,65 +1,69 @@
-context("Create a automation", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-  })
 
-  it("should create a automation", () => {
+filterTests(['smoke', 'all'], () => {
-    cy.createTestTableWithData()
+  context("Create a automation", () => {
-    cy.wait(2000)
+    before(() => {
-    cy.contains("Automate").click()
+      cy.login()
-    cy.get("[data-cy='new-screen'] > .spectrum-Icon").click()
+      cy.createTestApp()
-    cy.get(".modal-inner-wrapper").within(() => {
+    })
-      cy.get("input").type("Add Row")
+
-      cy.contains("Row Created").click({ force: true })
+    it("should create a automation", () => {
+      cy.createTestTableWithData()
+      cy.wait(2000)
+      cy.contains("Automate").click()
+      cy.get("[data-cy='new-screen'] > .spectrum-Icon").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get("input").type("Add Row")
+        cy.contains("Row Created").click({ force: true })
+        cy.wait(500)
+        cy.get(".spectrum-Button--cta").click()
+      })
+
+      // Setup trigger
+      cy.contains("Setup").click()
+      cy.get(".spectrum-Picker-label").click()
       cy.wait(500)
-      cy.get(".spectrum-Button--cta").click()
+      cy.contains("dog").click()
-    })
+      cy.wait(2000)
-
+      // Create action
-    // Setup trigger
+      cy.get('[aria-label="AddCircle"]').eq(1).click()
-    cy.contains("Setup").click()
+      cy.get(".modal-inner-wrapper").within(() => {
-    cy.get(".spectrum-Picker-label").click()
+        cy.wait(1000)
-    cy.wait(500)
+        cy.contains("Create Row").trigger('mouseover').click().click()
-    cy.contains("dog").click()
+        cy.get(".spectrum-Button--cta").click()
-    cy.wait(2000)
+      })
-    // Create action
+      cy.contains("Setup").click()
-    cy.get('[aria-label="AddCircle"]').eq(1).click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.wait(1000)
-      cy.contains("Create Row").trigger('mouseover').click().click()
-      cy.get(".spectrum-Button--cta").click()
-    })
-    cy.contains("Setup").click()
-    cy.get(".spectrum-Picker-label").click()
-    cy.contains("dog").click()
-    cy.get(".spectrum-Textfield-input")
-    .first()
-    .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false })
-    cy.get(".spectrum-Textfield-input")
-      .eq(1)
-      .type("11")
-    cy.contains("Finish and test automation").click()
-
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.wait(1000)
       cy.get(".spectrum-Picker-label").click()
       cy.contains("dog").click()
-      cy.wait(1000)
       cy.get(".spectrum-Textfield-input")
-        .first()
+      .first()
-        .type("automationGoodboy")
+      .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false })
       cy.get(".spectrum-Textfield-input")
         .eq(1)
         .type("11")
-      cy.get(".spectrum-Textfield-input")
+      cy.contains("Finish and test automation").click()
-        .eq(2)
+
-        .type("123456")
+      cy.get(".modal-inner-wrapper").within(() => {
-      cy.get(".spectrum-Textfield-input")
+        cy.wait(1000)
-        .eq(3)
+        cy.get(".spectrum-Picker-label").click()
-        .type("123456")
+        cy.contains("dog").click()
-      cy.contains("Test").click()
+        cy.wait(1000)
+        cy.get(".spectrum-Textfield-input")
+          .first()
+          .type("automationGoodboy")
+        cy.get(".spectrum-Textfield-input")
+          .eq(1)
+          .type("11")
+        cy.get(".spectrum-Textfield-input")
+          .eq(2)
+          .type("123456")
+        cy.get(".spectrum-Textfield-input")
+          .eq(3)
+          .type("123456")
+        cy.contains("Test").click()
+      })
+      cy.contains("Data").click()
+      cy.contains("automationGoodboy")
     })
-    cy.contains("Data").click()
-    cy.contains("automationGoodboy")
   })
 })

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

@@ -1,58 +1,62 @@
-context("Create Bindings", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-    cy.navigateToFrontend()
-  })
 
-  it("should add a current user binding", () => {
+filterTests(['smoke', 'all'], () => {
-    cy.addComponent("Elements", "Paragraph").then(() => {
+  context("Create Bindings", () => {
-      addSettingBinding("text", "Current User._id")
+    before(() => {
+      cy.login()
+      cy.createTestApp()
+      cy.navigateToFrontend()
+    })
+
+    it("should add a current user binding", () => {
+      cy.addComponent("Elements", "Paragraph").then(() => {
+        addSettingBinding("text", "Current User._id")
+      })
+    })
+
+    it("should handle an invalid binding", () => {
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
+        // Cypress needs to escape curly brackets
+        cy.get("[data-cy=setting-text] input")
+          .type("{{}{{}{{} Current User._id {}}{}}")
+          .blur()
+        cy.getComponent(componentId).should("have.text", "{{{ [user].[_id] }}")
+      })
+    })
+
+    it("should add a URL param binding", () => {
+      const paramName = "foo"
+      cy.createScreen("Test Param", `/test/:${paramName}`)
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
+        addSettingBinding("text", `URL.${paramName}`)
+        // The builder preview pages don't have a real URL, so all we can do
+        // is check that we were able to bind to the property, and that the
+        // component exists on the page
+        cy.getComponent(componentId).should("have.text", "New Paragraph")
+      })
+    })
+
+    it("should add a binding with a handlebars helper", () => {
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
+        // Cypress needs to escape curly brackets
+        cy.get("[data-cy=setting-text] input")
+          .type("{{}{{} add 1 2 {}}{}}")
+          .blur()
+        cy.getComponent(componentId).should("have.text", "3")
+      })
     })
   })
 
-  it("should handle an invalid binding", () => {
+  const addSettingBinding = (setting, bindingText, clickOption = true) => {
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
+    cy.get(`[data-cy="setting-${setting}"] [data-cy=text-binding-button]`).click()
-      // Cypress needs to escape curly brackets
+    cy.get(".drawer").within(() => {
-      cy.get("[data-cy=setting-text] input")
+      if (clickOption) {
-        .type("{{}{{}{{} Current User._id {}}{}}")
+        cy.contains(bindingText).click()
-        .blur()
+        cy.get("textarea").should("have.value", `{{ ${bindingText} }}`)
-      cy.getComponent(componentId).should("have.text", "{{{ [user].[_id] }}")
+      } else {
+        cy.get("textarea").type(bindingText)
+      }
+      cy.contains("Save").click()
     })
-  })
+  }
-
-  it("should add a URL param binding", () => {
-    const paramName = "foo"
-    cy.createScreen("Test Param", `/test/:${paramName}`)
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
-      addSettingBinding("text", `URL.${paramName}`)
-      // The builder preview pages don't have a real URL, so all we can do
-      // is check that we were able to bind to the property, and that the
-      // component exists on the page
-      cy.getComponent(componentId).should("have.text", "New Paragraph")
-    })
-  })
-
-  it("should add a binding with a handlebars helper", () => {
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
-      // Cypress needs to escape curly brackets
-      cy.get("[data-cy=setting-text] input")
-        .type("{{}{{} add 1 2 {}}{}}")
-        .blur()
-      cy.getComponent(componentId).should("have.text", "3")
-    })
-  })
 })
-
-const addSettingBinding = (setting, bindingText, clickOption = true) => {
-  cy.get(`[data-cy="setting-${setting}"] [data-cy=text-binding-button]`).click()
-  cy.get(".drawer").within(() => {
-    if (clickOption) {
-      cy.contains(bindingText).click()
-      cy.get("textarea").should("have.value", `{{ ${bindingText} }}`)
-    } else {
-      cy.get("textarea").type(bindingText)
-    }
-    cy.contains("Save").click()
-  })
-}

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

@@ -1,92 +1,97 @@
 // TODO for now components are skipped, might not be good to keep doing this
-xcontext("Create Components", () => {
-  let headlineId
 
-  before(() => {
+import filterTests from "../support/filterTests"
-    cy.login()
-    cy.createTestApp()
-    cy.createTable("dog")
-    cy.addColumn("dog", "name", "Text")
-    cy.addColumn("dog", "age", "Number")
-    cy.addColumn("dog", "type", "Options")
-    cy.navigateToFrontend()
-  })
 
-  it("should add a container", () => {
+filterTests(['all'], () => {
-    cy.addComponent(null, "Container").then(componentId => {
+  xcontext("Create Components", () => {
-      cy.getComponent(componentId).should("exist")
+    let headlineId
+
+    before(() => {
+      cy.login()
+      cy.createTestApp()
+      cy.createTable("dog")
+      cy.addColumn("dog", "name", "Text")
+      cy.addColumn("dog", "age", "Number")
+      cy.addColumn("dog", "type", "Options")
+      cy.navigateToFrontend()
     })
-  })
 
-  it("should add a headline", () => {
+    it("should add a container", () => {
-    cy.addComponent("Elements", "Headline").then(componentId => {
+      cy.addComponent(null, "Container").then(componentId => {
-      headlineId = componentId
+        cy.getComponent(componentId).should("exist")
-      cy.getComponent(headlineId).should("exist")
+      })
     })
-  })
 
-  it("should change the text of the headline", () => {
+    it("should add a headline", () => {
-    const text = "Lorem ipsum dolor sit amet."
+      cy.addComponent("Elements", "Headline").then(componentId => {
-    cy.get("[data-cy=Settings]").click()
+        headlineId = componentId
-    cy.get("[data-cy=setting-text] input")
+        cy.getComponent(headlineId).should("exist")
-      .type(text)
+      })
-      .blur()
+    })
-    cy.getComponent(headlineId).should("have.text", text)
-  })
 
-  it("should change the size of the headline", () => {
+    it("should change the text of the headline", () => {
-    cy.get("[data-cy=Design]").click()
+      const text = "Lorem ipsum dolor sit amet."
-    cy.contains("Typography").click()
-    cy.get("[data-cy=font-size-prop-control]").click()
-    cy.contains("60px").click()
-    cy.getComponent(headlineId).should("have.css", "font-size", "60px")
-  })
-
-  it("should create a form and reset to match schema", () => {
-    cy.addComponent("Form", "Form").then(() => {
       cy.get("[data-cy=Settings]").click()
-      cy.get("[data-cy=setting-dataSource]")
+      cy.get("[data-cy=setting-text] input")
-        .contains("Choose option")
+        .type(text)
-        .click()
+        .blur()
-      cy.get(".dropdown")
+      cy.getComponent(headlineId).should("have.text", text)
-        .contains("dog")
+    })
-        .click()
+
-      cy.addComponent("Form", "Field Group").then(fieldGroupId => {
+    it("should change the size of the headline", () => {
+      cy.get("[data-cy=Design]").click()
+      cy.contains("Typography").click()
+      cy.get("[data-cy=font-size-prop-control]").click()
+      cy.contains("60px").click()
+      cy.getComponent(headlineId).should("have.css", "font-size", "60px")
+    })
+
+    it("should create a form and reset to match schema", () => {
+      cy.addComponent("Form", "Form").then(() => {
         cy.get("[data-cy=Settings]").click()
-        cy.contains("Update Form Fields").click()
+        cy.get("[data-cy=setting-dataSource]")
-        cy.get(".modal")
+          .contains("Choose option")
-          .get("button.primary")
           .click()
-        cy.getComponent(fieldGroupId).within(() => {
+        cy.get(".dropdown")
-          cy.contains("name").should("exist")
+          .contains("dog")
-          cy.contains("age").should("exist")
+          .click()
-          cy.contains("type").should("exist")
+        cy.addComponent("Form", "Field Group").then(fieldGroupId => {
+          cy.get("[data-cy=Settings]").click()
+          cy.contains("Update Form Fields").click()
+          cy.get(".modal")
+            .get("button.primary")
+            .click()
+          cy.getComponent(fieldGroupId).within(() => {
+            cy.contains("name").should("exist")
+            cy.contains("age").should("exist")
+            cy.contains("type").should("exist")
+          })
+          cy.getComponent(fieldGroupId)
+            .find("input")
+            .should("have.length", 2)
+          cy.getComponent(fieldGroupId)
+            .find(".spectrum-Picker")
+            .should("have.length", 1)
         })
-        cy.getComponent(fieldGroupId)
-          .find("input")
-          .should("have.length", 2)
-        cy.getComponent(fieldGroupId)
-          .find(".spectrum-Picker")
-          .should("have.length", 1)
       })
     })
-  })
 
-  it("deletes a component", () => {
+    it("deletes a component", () => {
-    cy.addComponent("Elements", "Paragraph").then(componentId => {
+      cy.addComponent("Elements", "Paragraph").then(componentId => {
-      cy.get("[data-cy=setting-_instanceName] input")
+        cy.get("[data-cy=setting-_instanceName] input")
-        .type(componentId)
+          .type(componentId)
-        .blur()
+          .blur()
-      cy.get(".ui-nav ul .nav-item.selected .ri-more-line").click({
+        cy.get(".ui-nav ul .nav-item.selected .ri-more-line").click({
-        force: true,
+          force: true,
+        })
+        cy.get(".dropdown-container")
+          .contains("Delete")
+          .click()
+        cy.get(".modal")
+          .contains("Delete Component")
+          .click()
+        cy.getComponent(componentId).should("not.exist")
       })
-      cy.get(".dropdown-container")
-        .contains("Delete")
-        .click()
-      cy.get(".modal")
-        .contains("Delete Component")
-        .click()
-      cy.getComponent(componentId).should("not.exist")
     })
   })
 })

packages/builder/cypress/integration/createScreen.js

@@ -1,21 +1,25 @@
-context("Screen Tests", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-    cy.navigateToFrontend()
-  })
 
-  it("Should successfully create a screen", () => {
+filterTests(['smoke', 'all'], () => {
-    cy.createScreen("Test Screen", "/test")
+  context("Screen Tests", () => {
-    cy.get(".nav-items-container").within(() => {
+    before(() => {
-      cy.contains("/test").should("exist")
+      cy.login()
+      cy.createTestApp()
+      cy.navigateToFrontend()
     })
-  })
 
-  it("Should update the url", () => {
+    it("Should successfully create a screen", () => {
-    cy.createScreen("Test Screen", "test with spaces")
+      cy.createScreen("Test Screen", "/test")
-    cy.get(".nav-items-container").within(() => {
+      cy.get(".nav-items-container").within(() => {
-      cy.contains("/test-with-spaces").should("exist")
+        cy.contains("/test").should("exist")
+      })
+    })
+
+    it("Should update the url", () => {
+      cy.createScreen("Test Screen", "test with spaces")
+      cy.get(".nav-items-container").within(() => {
+        cy.contains("/test-with-spaces").should("exist")
+      })
     })
   })  
 })

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

@@ -1,103 +1,107 @@
-context("Create a Table", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-  })
 
-  it("should create a new Table", () => {
+filterTests(['smoke', 'all'], () => {
-    cy.createTable("dog")
+  context("Create a Table", () => {
-    cy.wait(1000)
+    before(() => {
-    // Check if Table exists
+      cy.login()
-    cy.get(".table-title h1").should("have.text", "dog")
+      cy.createTestApp()
-  })
-
-  it("adds a new column to the table", () => {
-    cy.addColumn("dog", "name", "Text")
-    cy.contains("name").should("be.visible")
-  })
-
-  it("creates a row in the table", () => {
-    cy.addRow(["Rover"])
-    cy.contains("Rover").should("be.visible")
-  })
-
-  it("updates a column on the table", () => {
-    cy.get(".title").click()
-    cy.get(".spectrum-Table-editIcon > use").click()
-    cy.get("input").eq(1).type("updated", { force: true })
-    // Unset table display column
-    cy.get(".spectrum-Switch-input").eq(1).click()
-    cy.contains("Save Column").click()
-    cy.contains("nameupdated ").should("contain", "nameupdated")
-  })
-  
-  it("edits a row", () => {
-    cy.contains("button", "Edit").click({ force: true })
-    cy.wait(1000)
-    cy.get(".spectrum-Modal input").clear()
-    cy.get(".spectrum-Modal input").type("Updated")
-    cy.contains("Save").click()
-    cy.contains("Updated").should("have.text", "Updated")
-  })
-  
-  it("deletes a row", () => {
-    cy.get(".spectrum-Checkbox-input").check({ force: true })
-    cy.contains("Delete 1 row(s)").click()
-    cy.get(".spectrum-Modal").contains("Delete").click()
-    cy.contains("RoverUpdated").should("not.exist")
-  })
-  
-  it("Adds 15 rows and checks pagination", () => {
-    // 10 rows per page, 15 rows should create 2 pages within table
-    const totalRows = 16
-    for (let i = 1; i < totalRows; i++){
-      cy.addRow([i])
-    }
-    cy.wait(1000)
-    cy.get(".spectrum-Pagination").within(() => {
-      cy.get(".spectrum-ActionButton").eq(1).click()
     })
-    cy.get(".spectrum-Pagination").within(() => {
+
-      cy.get(".spectrum-Body--secondary").contains("Page 2")
+    it("should create a new Table", () => {
+      cy.createTable("dog")
+      cy.wait(1000)
+      // Check if Table exists
+      cy.get(".table-title h1").should("have.text", "dog")
     })
-  })
 
-  it("Deletes rows and checks pagination", () => {
+    it("adds a new column to the table", () => {
-    // Delete rows, removing second page of rows from table
+      cy.addColumn("dog", "name", "Text")
-    const deleteRows = 5
+      cy.contains("name").should("be.visible")
-    cy.get(".spectrum-Checkbox-input").check({ force: true })
-    cy.get(".spectrum-Table-body")
-    cy.contains("Delete 5 row(s)").click()
-    cy.get(".spectrum-Modal").contains("Delete").click()
-    cy.wait(1000)
-    
-    // Confirm table only has one page
-    cy.get(".spectrum-Pagination").within(() => {
-      cy.get(".spectrum-ActionButton").eq(1).should('not.be.enabled')
     })
-  })
 
-  it("deletes a column", () => {
+    it("creates a row in the table", () => {
-    const columnName = "nameupdated"
+      cy.addRow(["Rover"])
-    cy.get(".title").click()
+      cy.contains("Rover").should("be.visible")
-    cy.get(".spectrum-Table-editIcon > use").click()
+    })
-    cy.contains("Delete").click()
-    cy.get('[data-cy="delete-column-confirm"]').type(columnName)
-    cy.contains("Delete Column").click()
-    cy.contains("nameupdated").should("not.exist")
-  })
 
-  it("deletes a table", () => {
+    it("updates a column on the table", () => {
-    cy.get(".nav-item")
+      cy.get(".title").click()
-      .contains("dog")
+      cy.get(".spectrum-Table-editIcon > use").click()
-      .parents(".nav-item")
+      cy.get("input").eq(1).type("updated", { force: true })
-      .first()
+      // Unset table display column
-      .within(() => {
+      cy.get(".spectrum-Switch-input").eq(1).click()
-        cy.get(".actions .spectrum-Icon").click({ force: true })
+      cy.contains("Save Column").click()
+      cy.contains("nameupdated ").should("contain", "nameupdated")
+    })
+    
+    it("edits a row", () => {
+      cy.contains("button", "Edit").click({ force: true })
+      cy.wait(1000)
+      cy.get(".spectrum-Modal input").clear()
+      cy.get(".spectrum-Modal input").type("Updated")
+      cy.contains("Save").click()
+      cy.contains("Updated").should("have.text", "Updated")
+    })
+    
+    it("deletes a row", () => {
+      cy.get(".spectrum-Checkbox-input").check({ force: true })
+      cy.contains("Delete 1 row(s)").click()
+      cy.get(".spectrum-Modal").contains("Delete").click()
+      cy.contains("RoverUpdated").should("not.exist")
+    })
+    
+    it("Adds 15 rows and checks pagination", () => {
+      // 10 rows per page, 15 rows should create 2 pages within table
+      const totalRows = 16
+      for (let i = 1; i < totalRows; i++){
+        cy.addRow([i])
+      }
+      cy.wait(1000)
+      cy.get(".spectrum-Pagination").within(() => {
+        cy.get(".spectrum-ActionButton").eq(1).click()
       })
-    cy.get(".spectrum-Menu > :nth-child(2)").click()
+      cy.get(".spectrum-Pagination").within(() => {
-    cy.get('[data-cy="delete-table-confirm"]').type("dog")
+        cy.get(".spectrum-Body--secondary").contains("Page 2")
-    cy.contains("Delete Table").click()
+      })
-    cy.contains("dog").should("not.exist")
+    })
+    
+    it("Deletes rows and checks pagination", () => {
+      // Delete rows, removing second page of rows from table
+      const deleteRows = 5
+      cy.get(".spectrum-Checkbox-input").check({ force: true })
+      cy.get(".spectrum-Table-body")
+      cy.contains("Delete 5 row(s)").click()
+      cy.get(".spectrum-Modal").contains("Delete").click()
+      cy.wait(1000)
+      
+      // Confirm table only has one page
+      cy.get(".spectrum-Pagination").within(() => {
+        cy.get(".spectrum-ActionButton").eq(1).should('not.be.enabled')
+      })
+    })
+
+    it("deletes a column", () => {
+      const columnName = "nameupdated"
+      cy.get(".title").click()
+      cy.get(".spectrum-Table-editIcon > use").click()
+      cy.contains("Delete").click()
+      cy.get('[data-cy="delete-column-confirm"]').type(columnName)
+      cy.contains("Delete Column").click()
+      cy.contains("nameupdated").should("not.exist")
+    })
+
+    it("deletes a table", () => {
+      cy.get(".nav-item")
+        .contains("dog")
+        .parents(".nav-item")
+        .first()
+        .within(() => {
+          cy.get(".actions .spectrum-Icon").click({ force: true })
+        })
+      cy.get(".spectrum-Menu > :nth-child(2)").click()
+      cy.get('[data-cy="delete-table-confirm"]').type("dog")
+      cy.contains("Delete Table").click()
+      cy.contains("dog").should("not.exist")
+    })
   })
 })

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

@@ -1,128 +1,133 @@
-context("Create a User and Assign Roles", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-  })
 
-  it("should create a user", () => {
-    cy.createUser("bbuser@test.com")
-    cy.get(".spectrum-Table-body").should('contain', 'bbuser')
-  })
 
-  it("should confirm there is No Access for a New User", () => {
+filterTests(['smoke', 'all'], () => {
-    // Click into the user
+  context("Create a User and Assign Roles", () => {
-    cy.contains("bbuser").click()
+    before(() => {
-    cy.wait(500)
+      cy.login()
-    // Get No Access table - Confirm it has apps in it
-    cy.get(".spectrum-Table").eq(1).should('not.contain', 'No rows found')
-    // Get Configure Roles table - Confirm it has no apps
-    cy.get(".spectrum-Table").eq(0).contains('No rows found')
-  })
-  
-  it("should assign role types", () => {
-    // 3 apps minimum required - to assign an app to each role type
-    cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-    .its("body")
-    .then(val => {
-      if (val.length < 3) {
-        for (let i = 1; i < 3; i++) {
-          const uuid = () => Cypress._.random(0, 1e6)
-          const name = uuid()
-          cy.createApp(name)
-        }
-      }
     })
-    // Navigate back to the user
+
-    cy.visit(`${Cypress.config().baseUrl}/builder`)
+    it("should create a user", () => {
-    cy.wait(1000)
+      cy.createUser("bbuser@test.com")
-    cy.get(".spectrum-SideNav").contains("Users").click()
+      cy.get(".spectrum-Table-body").should('contain', 'bbuser')
-    cy.get(".spectrum-Table").contains("bbuser").click()
+    })
-    cy.wait(500)
+    
-    for (let i = 0; i < 3; i++) {
+    it("should confirm there is No Access for a New User", () => {
-      cy.get(".spectrum-Table-body").eq(1).find('tr').eq(0).click()
+      // Click into the user
+      cy.contains("bbuser").click()
       cy.wait(500)
-      cy.get(".spectrum-Dialog-grid").contains("Choose an option").click().then(() => {
+      // Get No Access table - Confirm it has apps in it
-        cy.wait(500)
+      cy.get(".spectrum-Table").eq(1).should('not.contain', 'No rows found')
-        if (i == 0) {
+      // Get Configure Roles table - Confirm it has no apps
-          cy.get(".spectrum-Popover").contains("Admin").click()
+      cy.get(".spectrum-Table").eq(0).contains('No rows found')
+    })
+    
+    it("should assign role types", () => {
+      // 3 apps minimum required - to assign an app to each role type
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length < 3) {
+          for (let i = 1; i < 3; i++) {
+            const uuid = () => Cypress._.random(0, 1e6)
+            const name = uuid()
+            cy.createApp(name)
+          }
         }
-        if (i == 1) {
-          cy.get(".spectrum-Popover").contains("Power").click()
-        }
-        if (i == 2) {
-          cy.get(".spectrum-Popover").contains("Basic").click()
-        }
-        cy.wait(500)
-        cy.get(".spectrum-Button").contains("Update role").click({ force: true })
-        })
-      }
-      // Confirm roles exist within Configure roles table
-      cy.wait(500)
-      cy.get(".spectrum-Table-body").eq(0).within((assginedRoles) => {
-        expect(assginedRoles).to.contain("Admin")
-        expect(assginedRoles).to.contain("Power")
-        expect(assginedRoles).to.contain("Basic")
       })
-    })
+      // Navigate back to the user
-    
+      cy.visit(`${Cypress.config().baseUrl}/builder`)
-  it("should unassign role types", () => {
+      cy.wait(1000)
-    // Set each app within Configure roles table to 'No Access'
+      cy.get(".spectrum-SideNav").contains("Users").click()
-    cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').then((len) => {
+      cy.get(".spectrum-Table").contains("bbuser").click()
-      for (let i = 0; i < len; i ++){
+      cy.wait(500)
-        cy.get(".spectrum-Table-body").eq(0).find('tr').eq(0).click().then(() => {
+      for (let i = 0; i < 3; i++) {
-          cy.get(".spectrum-Form-item").contains("Role").parent().within(() => {
+        cy.get(".spectrum-Table-body").eq(1).find('tr').eq(0).click()
-            cy.get(".spectrum-Picker").click({ force: true })
+        cy.wait(500)
-            cy.wait(500)
+        cy.get(".spectrum-Dialog-grid").contains("Choose an option").click().then(() => {
-            cy.get(".spectrum-Popover").contains("No Access").click()
+          cy.wait(500)
-          })
+          if (i == 0) {
+            cy.get(".spectrum-Popover").contains("Admin").click()
+          }
+          if (i == 1) {
+            cy.get(".spectrum-Popover").contains("Power").click()
+          }
+          if (i == 2) {
+            cy.get(".spectrum-Popover").contains("Basic").click()
+          }
+          cy.wait(500)
           cy.get(".spectrum-Button").contains("Update role").click({ force: true })
-          cy.wait(1000)
+          })
-        })
+        }
-      }
+        // Confirm roles exist within Configure roles table
-    })
-    // Confirm Configure roles table no longer has any apps in it
-    cy.get(".spectrum-Table-body").eq(0).contains('No rows found')
-  })
-    
-  it("should enable Developer access", () => {
-    // Enable Developer access
-    cy.get(".field").eq(4).within(() => {
-      cy.get(".spectrum-Switch-input").click({ force: true })
-    })
-    // No Access table should now be empty
-    cy.get(".container").contains("No Access").parent().within(() => {
-      cy.get(".spectrum-Table").contains("No rows found")
-    })
-    
-    // Each app within Configure roles should have Admin access
-    cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').then((len) => {
-      for (let i = 0; i < len; i++) {
-        cy.get(".spectrum-Table-body").eq(0).find('tr').eq(i).contains("Admin")
         cy.wait(500)
-      }
+        cy.get(".spectrum-Table-body").eq(0).within((assginedRoles) => {
-    })
+          expect(assginedRoles).to.contain("Admin")
-  })
+          expect(assginedRoles).to.contain("Power")
+          expect(assginedRoles).to.contain("Basic")
+        })
+      })
       
-  it("should disable Developer access", () => {
+    it("should unassign role types", () => {
-    // Disable Developer access
+      // Set each app within Configure roles table to 'No Access'
-    cy.get(".field").eq(4).within(() => {
+      cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').then((len) => {
-      cy.get(".spectrum-Switch-input").click({ force: true })
+        for (let i = 0; i < len; i ++){
+          cy.get(".spectrum-Table-body").eq(0).find('tr').eq(0).click().then(() => {
+            cy.get(".spectrum-Form-item").contains("Role").parent().within(() => {
+              cy.get(".spectrum-Picker").click({ force: true })
+              cy.wait(500)
+              cy.get(".spectrum-Popover").contains("No Access").click()
+            })
+            cy.get(".spectrum-Button").contains("Update role").click({ force: true })
+            cy.wait(1000)
+          })
+        }
+      })
+      // Confirm Configure roles table no longer has any apps in it
+      cy.get(".spectrum-Table-body").eq(0).contains('No rows found')
     })
-    // Configure roles table should now be empty
-    cy.get(".container").contains("Configure roles").parent().within(() => {
-      cy.get(".spectrum-Table").contains("No rows found")
-    })
-  })
       
-  it("should delete a user", () => {
+    it("should enable Developer access", () => {
-    // Click Delete user button
+      // Enable Developer access
-    cy.get(".spectrum-Button").contains("Delete user").click({force: true}).then(() => {
+      cy.get(".field").eq(4).within(() => {
-      // Confirm deletion within modal
+        cy.get(".spectrum-Switch-input").click({ force: true })
-      cy.wait(500)
+      })
-      cy.get(".spectrum-Dialog-grid").within(() => {
+      // No Access table should now be empty
-        cy.get(".spectrum-Button").contains("Delete user").click({force: true})
+      cy.get(".container").contains("No Access").parent().within(() => {
-        cy.wait(4000)
+        cy.get(".spectrum-Table").contains("No rows found")
+      })
+      
+      // Each app within Configure roles should have Admin access
+      cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').then((len) => {
+        for (let i = 0; i < len; i++) {
+          cy.get(".spectrum-Table-body").eq(0).find('tr').eq(i).contains("Admin")
+          cy.wait(500)
+        }
       })
     })
-    cy.get(".spectrum-Table-body").should("not.have.text", "bbuser")
+      
+    it("should disable Developer access", () => {
+      // Disable Developer access
+      cy.get(".field").eq(4).within(() => {
+        cy.get(".spectrum-Switch-input").click({ force: true })
+      })
+      // Configure roles table should now be empty
+      cy.get(".container").contains("Configure roles").parent().within(() => {
+        cy.get(".spectrum-Table").contains("No rows found")
+      })
+    })
+    
+    it("should delete a user", () => {
+      // Click Delete user button
+      cy.get(".spectrum-Button").contains("Delete user").click({force: true}).then(() => {
+        // Confirm deletion within modal
+        cy.wait(500)
+        cy.get(".spectrum-Dialog-grid").within(() => {
+          cy.get(".spectrum-Button").contains("Delete user").click({force: true})
+          cy.wait(4000)
+        })
+      })
+      cy.get(".spectrum-Table-body").should("not.have.text", "bbuser")
+    })
   })
 })

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

@@ -1,152 +1,156 @@
-context("Create a View", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.createTestApp()
-    cy.createTable("data")
-    cy.addColumn("data", "group", "Text")
-    cy.addColumn("data", "age", "Number")
-    cy.addColumn("data", "rating", "Number")
 
-    // 6 Rows
+filterTests(['smoke', 'all'], () => {
-    cy.addRow(["Students", 25, 1])
+  context("Create a View", () => {
-    cy.addRow(["Students", 20, 3])
+    before(() => {
-    cy.addRow(["Students", 18, 6])
+      cy.login()
-    cy.addRow(["Students", 25, 2])
+      cy.createTestApp()
-    cy.addRow(["Teachers", 49, 5])
+      cy.createTable("data")
-    cy.addRow(["Teachers", 36, 3])
+      cy.addColumn("data", "group", "Text")
-  })
+      cy.addColumn("data", "age", "Number")
+      cy.addColumn("data", "rating", "Number")
 
-  it("creates a view", () => {
+      // 6 Rows
-    cy.contains("Create view").click()
+      cy.addRow(["Students", 25, 1])
-    cy.get(".modal-inner-wrapper").within(() => {
+      cy.addRow(["Students", 20, 3])
-      cy.get("input").type("Test View")
+      cy.addRow(["Students", 18, 6])
-      cy.get("button").contains("Create View").click({ force: true })
+      cy.addRow(["Students", 25, 2])
+      cy.addRow(["Teachers", 49, 5])
+      cy.addRow(["Teachers", 36, 3])
     })
-    cy.get(".table-title h1").contains("Test View")
+
-    cy.get(".title").then($headers => {
+    it("creates a view", () => {
-      expect($headers).to.have.length(3)
+      cy.contains("Create view").click()
-      const headers = Array.from($headers).map(header =>
+      cy.get(".modal-inner-wrapper").within(() => {
-        header.textContent.trim()
+        cy.get("input").type("Test View")
-      )
+        cy.get("button").contains("Create View").click({ force: true })
-      expect(removeSpacing(headers)).to.deep.eq(["group", "age", "rating"])
+      })
+      cy.get(".table-title h1").contains("Test View")
+      cy.get(".title").then($headers => {
+        expect($headers).to.have.length(3)
+        const headers = Array.from($headers).map(header =>
+          header.textContent.trim()
+        )
+        expect(removeSpacing(headers)).to.deep.eq(["group", "age", "rating"])
+      })
+    })
+
+    it("filters the view by age over 10", () => {
+      cy.contains("Filter").click()
+      cy.contains("Add Filter").click()
+
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get(".spectrum-Picker-label").eq(0).click()
+        cy.contains("age").click({ force: true })
+
+        cy.get(".spectrum-Picker-label").eq(1).click()
+        cy.contains("More Than").click({ force: true })
+
+        cy.get("input").type(18)
+        cy.contains("Save").click()
+      })
+
+      cy.get(".spectrum-Table-row").get($values => {
+        expect($values).to.have.length(5)
+      })
+    })
+
+    it("creates a stats calculation view based on age", () => {
+      cy.wait(1000)
+      cy.contains("Calculate").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get(".spectrum-Picker-label").eq(0).click()
+        cy.contains("Statistics").click()
+
+        cy.get(".spectrum-Picker-label").eq(1).click()
+        cy.contains("age").click({ force: true })
+
+        cy.get(".spectrum-Button").contains("Save").click({ force: true })
+      })
+      cy.wait(1000)
+
+      cy.get(".title").then($headers => {
+        expect($headers).to.have.length(7)
+        const headers = Array.from($headers).map(header =>
+          header.textContent.trim()
+        )
+        expect(removeSpacing(headers)).to.deep.eq([
+          "field",
+          "sum",
+          "min",
+          "max",
+          "count",
+          "sumsqr",
+          "avg",
+        ])
+      })
+      cy.get(".spectrum-Table-cell").then($values => {
+        let values = Array.from($values).map(header => header.textContent.trim())
+        expect(values).to.deep.eq(["age", "155", "20", "49", "5", "5347", "31"])
+      })
+    })
+
+    it("groups the view by group", () => {
+      cy.contains("Group by").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get(".spectrum-Picker-label").eq(0).click()
+        cy.contains("group").click()
+        cy.contains("Save").click()
+      })
+      cy.wait(1000)
+      cy.contains("Students").should("be.visible")
+      cy.contains("Teachers").should("be.visible")
+
+      cy.get(".spectrum-Table-cell").then($values => {
+        let values = Array.from($values).map(header => header.textContent.trim())
+        expect(values).to.deep.eq([
+          "Students",
+          "70",
+          "20",
+          "25",
+          "3",
+          "1650",
+          "23.333333333333332",
+          "Teachers",
+          "85",
+          "36",
+          "49",
+          "2",
+          "3697",
+          "42.5",
+        ])
+      })
+    })
+
+    it("renames a view", () => {
+      cy.contains(".nav-item", "Test View")
+        .find(".actions .icon")
+        .click({ force: true })
+      cy.get(".spectrum-Menu-itemLabel").contains("Edit").click()
+      cy.get(".modal-inner-wrapper").within(() => {
+        cy.get("input").type(" Updated")
+        cy.contains("Save").click()
+      })
+      cy.wait(1000)
+      cy.contains("Test View Updated").should("be.visible")
+    })
+
+    it("deletes a view", () => {
+      cy.contains(".nav-item", "Test View Updated")
+        .find(".actions .icon")
+        .click({ force: true })
+      cy.contains("Delete").click()
+      cy.contains("Delete View").click()
+      cy.wait(500)
+      cy.contains("TestView Updated").should("not.exist")
     })
   })
 
-  it("filters the view by age over 10", () => {
+  function removeSpacing(headers) {
-    cy.contains("Filter").click()
+    let newHeaders = []
-    cy.contains("Add Filter").click()
+    for (let header of headers) {
-
+      newHeaders.push(header.replace(/\s\s+/g, " "))
-    cy.get(".modal-inner-wrapper").within(() => {
+    }
-      cy.get(".spectrum-Picker-label").eq(0).click()
+    return newHeaders
-      cy.contains("age").click({ force: true })
-
-      cy.get(".spectrum-Picker-label").eq(1).click()
-      cy.contains("More Than").click({ force: true })
-
-      cy.get("input").type(18)
-      cy.contains("Save").click()
-    })
-
-    cy.get(".spectrum-Table-row").get($values => {
-      expect($values).to.have.length(5)
-    })
-  })
-
-  it("creates a stats calculation view based on age", () => {
-    cy.wait(1000)
-    cy.contains("Calculate").click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.get(".spectrum-Picker-label").eq(0).click()
-      cy.contains("Statistics").click()
-
-      cy.get(".spectrum-Picker-label").eq(1).click()
-      cy.contains("age").click({ force: true })
-
-      cy.get(".spectrum-Button").contains("Save").click({ force: true })
-    })
-    cy.wait(1000)
-
-    cy.get(".title").then($headers => {
-      expect($headers).to.have.length(7)
-      const headers = Array.from($headers).map(header =>
-        header.textContent.trim()
-      )
-      expect(removeSpacing(headers)).to.deep.eq([
-        "field",
-        "sum",
-        "min",
-        "max",
-        "count",
-        "sumsqr",
-        "avg",
-      ])
-    })
-    cy.get(".spectrum-Table-cell").then($values => {
-      let values = Array.from($values).map(header => header.textContent.trim())
-      expect(values).to.deep.eq(["age", "155", "20", "49", "5", "5347", "31"])
-    })
-  })
-
-  it("groups the view by group", () => {
-    cy.contains("Group by").click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.get(".spectrum-Picker-label").eq(0).click()
-      cy.contains("group").click()
-      cy.contains("Save").click()
-    })
-    cy.wait(1000)
-    cy.contains("Students").should("be.visible")
-    cy.contains("Teachers").should("be.visible")
-
-    cy.get(".spectrum-Table-cell").then($values => {
-      let values = Array.from($values).map(header => header.textContent.trim())
-      expect(values).to.deep.eq([
-        "Students",
-        "70",
-        "20",
-        "25",
-        "3",
-        "1650",
-        "23.333333333333332",
-        "Teachers",
-        "85",
-        "36",
-        "49",
-        "2",
-        "3697",
-        "42.5",
-      ])
-    })
-  })
-
-  it("renames a view", () => {
-    cy.contains(".nav-item", "Test View")
-      .find(".actions .icon")
-      .click({ force: true })
-    cy.get(".spectrum-Menu-itemLabel").contains("Edit").click()
-    cy.get(".modal-inner-wrapper").within(() => {
-      cy.get("input").type(" Updated")
-      cy.contains("Save").click()
-    })
-    cy.wait(1000)
-    cy.contains("Test View Updated").should("be.visible")
-  })
-
-  it("deletes a view", () => {
-    cy.contains(".nav-item", "Test View Updated")
-      .find(".actions .icon")
-      .click({ force: true })
-    cy.contains("Delete").click()
-    cy.contains("Delete View").click()
-    cy.wait(500)
-    cy.contains("TestView Updated").should("not.exist")
-  })
-})
-
-function removeSpacing(headers) {
-  let newHeaders = []
-  for (let header of headers) {
-    newHeaders.push(header.replace(/\s\s+/g, " "))
   }
-  return newHeaders
+})
-}

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

@@ -1,83 +1,87 @@
-xcontext("Custom Theming Properties", () => {
+import filterTests from "../support/filterTests"
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-      cy.navigateToFrontend()
-    })
 
-    /* Default Values:
+filterTests(['all'], () => {
-    Button roundness = Large
+  xcontext("Custom Theming Properties", () => {
-    Accent colour = Blue 600
+      before(() => {
-    Accent colour (hover) = Blue 500
+        cy.login()
-    Navigation bar background colour = Gray 100
+        cy.createTestApp()
-    Navigation bar text colour = Gray 800 */
+        cy.navigateToFrontend()
-    it("should reset the color property values", () => {
+      })
-      // Open Theme modal and change colours  
-      cy.get(".spectrum-ActionButton-label").contains("Theme").click()
-        cy.get(".spectrum-Picker").contains("Large").click()
-        .parents()
-        .get(".spectrum-Menu-itemLabel").contains("None").click()
-        changeThemeColors()
-        // Reset colours
-        cy.get(".spectrum-Button-label").contains("Reset").click({force: true})
-        // Check values have reset
-        checkThemeColorDefaults()
-    })
 
-    /* Button Roundness Values:
+      /* Default Values:
-    None = 0
+      Button roundness = Large
-    Small = 4px
+      Accent colour = Blue 600
-    Medium = 8px
+      Accent colour (hover) = Blue 500
-    Large = 16px */
+      Navigation bar background colour = Gray 100
-    it("should test button roundness", () => {
+      Navigation bar text colour = Gray 800 */
-      const buttonRoundnessValues = ["0", "4px", "8px", "16px"]
+      it("should reset the color property values", () => {
-      cy.wait(1000)
+        // Open Theme modal and change colours  
-      // Add button, change roundness and confirm value
+        cy.get(".spectrum-ActionButton-label").contains("Theme").click()
-      cy.addComponent("Button", null).then((componentId) => {
+          cy.get(".spectrum-Picker").contains("Large").click()
-        buttonRoundnessValues.forEach(function (item, index){
+          .parents()
-          cy.get(".spectrum-ActionButton-label").contains("Theme").click()
+          .get(".spectrum-Menu-itemLabel").contains("None").click()
-          cy.get(".setting").contains("Button roundness").parent()
+          changeThemeColors()
-          .get(".select-wrapper").click()
+          // Reset colours
-          cy.get(".spectrum-Popover").find('li').eq(index).click()
+          cy.get(".spectrum-Button-label").contains("Reset").click({force: true})
-          cy.get(".spectrum-Button").contains("View changes").click({force: true})
+          // Check values have reset
-          cy.reload()
+          checkThemeColorDefaults()
-          cy.getComponent(componentId)
+      })
-        .parents(".svelte-xiqd1c").eq(0).should('have.attr', 'style').and('contains', `--buttonBorderRadius:${item}`)
+      
+      /* Button Roundness Values:
+      None = 0
+      Small = 4px
+      Medium = 8px
+      Large = 16px */
+      it("should test button roundness", () => {
+        const buttonRoundnessValues = ["0", "4px", "8px", "16px"]
+        cy.wait(1000)
+        // Add button, change roundness and confirm value
+        cy.addComponent("Button", null).then((componentId) => {
+          buttonRoundnessValues.forEach(function (item, index){
+            cy.get(".spectrum-ActionButton-label").contains("Theme").click()
+            cy.get(".setting").contains("Button roundness").parent()
+            .get(".select-wrapper").click()
+            cy.get(".spectrum-Popover").find('li').eq(index).click()
+            cy.get(".spectrum-Button").contains("View changes").click({force: true})
+            cy.reload()
+            cy.getComponent(componentId)
+          .parents(".svelte-xiqd1c").eq(0).should('have.attr', 'style').and('contains', `--buttonBorderRadius:${item}`)
+        })
       })
     })
+      
+      const changeThemeColors = () => {
+        // Changes the theme colours
+        cy.get(".spectrum-FieldLabel").contains("Accent color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Red 400"]').click()
+          cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Orange 400"]').click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Yellow 400"]').click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .find('[title="Green 400"]').click()
+      }
+      
+      const checkThemeColorDefaults = () => {
+        cy.get(".spectrum-FieldLabel").contains("Accent color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Blue 600"]').children().find('[aria-label="Checkmark"]')
+          cy.get(".spectrum-Dialog-grid").click()
+          cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Blue 500"]').children().find('[aria-label="Checkmark"]')
+          cy.get(".spectrum-Dialog-grid").click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Gray 100"]').children().find('[aria-label="Checkmark"]')
+          cy.get(".spectrum-Dialog-grid").click()
+          cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
+          .parent().find(".container.svelte-z3cm5a").click()
+          .get('[title="Gray 800"]').children().find('[aria-label="Checkmark"]')
+      }
   })
-    
-    const changeThemeColors = () => {
-      // Changes the theme colours
-      cy.get(".spectrum-FieldLabel").contains("Accent color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Red 400"]').click()
-        cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Orange 400"]').click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Yellow 400"]').click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .find('[title="Green 400"]').click()
-    }
-    
-    const checkThemeColorDefaults = () => {
-      cy.get(".spectrum-FieldLabel").contains("Accent color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Blue 600"]').children().find('[aria-label="Checkmark"]')
-        cy.get(".spectrum-Dialog-grid").click()
-        cy.get(".spectrum-FieldLabel").contains("Accent color (hover)")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Blue 500"]').children().find('[aria-label="Checkmark"]')
-        cy.get(".spectrum-Dialog-grid").click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar background color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Gray 100"]').children().find('[aria-label="Checkmark"]')
-        cy.get(".spectrum-Dialog-grid").click()
-        cy.get(".spectrum-FieldLabel").contains("Navigation bar text color")
-        .parent().find(".container.svelte-z3cm5a").click()
-        .get('[title="Gray 800"]').children().find('[aria-label="Checkmark"]')
-    }
 })

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

@@ -1,37 +1,41 @@
-context("Datasource Wizard", () => {
+import filterTests from "../../support/filterTests"
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
 
-  it("should navigate in and out of a datasource via wizard", () => {
+filterTests(['all'], () => {
-    // Select PostgreSQL and add config (without fetch)
+  context("Datasource Wizard", () => {
-    const datasource = "Oracle"
+      before(() => {
-    cy.selectExternalDatasource(datasource)
+        cy.login()
-    cy.addDatasourceConfig(datasource, true)
+        cy.createTestApp()
+      })
 
-    // Navigate back within datasource wizard
+    it("should navigate in and out of a datasource via wizard", () => {
-    cy.get(".spectrum-Dialog-grid").within(() => {
+      // Select PostgreSQL and add config (without fetch)
-      cy.get(".spectrum-Button").contains("Back").click({ force: true })
+      const datasource = "Oracle"
-      cy.wait(1000)
+      cy.selectExternalDatasource(datasource)
-    })
+      cy.addDatasourceConfig(datasource, true)
       
-    // Select PostgreSQL datasource again
+      // Navigate back within datasource wizard
-    cy.get(".item-list").contains(datasource).click()
+      cy.get(".spectrum-Dialog-grid").within(() => {
-    cy.get(".spectrum-Dialog-grid").within(() => {
+        cy.get(".spectrum-Button").contains("Back").click({ force: true })
-      cy.get(".spectrum-Button").contains("Continue").click({ force: true })
+        cy.wait(1000)
-    })
+      })
     
-    // Fetch tables after selection
+      // Select PostgreSQL datasource again
-    // Previously entered config should not have been saved
+      cy.get(".item-list").contains(datasource).click()
-    // Config is back to default values
+      cy.get(".spectrum-Dialog-grid").within(() => {
-    // Modal will close and provide 500 error
+        cy.get(".spectrum-Button").contains("Continue").click({ force: true })
-    cy.intercept('**/datasources').as('datasourceConnection')
+      })
-    cy.get(".spectrum-Dialog-grid").within(() => {
+      
-      cy.get(".spectrum-Button").contains("Save and fetch tables").click({ force: true })
+      // Fetch tables after selection
+      // Previously entered config should not have been saved
+      // Config is back to default values
+      // Modal will close and provide 500 error
+      cy.intercept('**/datasources').as('datasourceConnection')
+      cy.get(".spectrum-Dialog-grid").within(() => {
+        cy.get(".spectrum-Button").contains("Save and fetch tables").click({ force: true })
+      })
+      cy.wait("@datasourceConnection")
+      cy.get("@datasourceConnection").its('response.body')
+          .should('have.property', 'status', 500)
     })
-    cy.wait("@datasourceConnection")
-    cy.get("@datasourceConnection").its('response.body')
-        .should('have.property', 'status', 500)
   })
 })

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

@@ -1,187 +1,191 @@
-context("MySQL Datasource Testing", () => {
+import filterTests from "../../support/filterTests"
-    if (Cypress.env("TEST_ENV")) {
 
-        before(() => {
+filterTests(['all'], () => {
-        cy.login()
+    context("MySQL Datasource Testing", () => {
-        cy.createTestApp()
+        if (Cypress.env("TEST_ENV")) {
-        })
-        const datasource = "MySQL"
-        const queryName = "Cypress Test Query"
-        const queryRename = "CT Query Rename"
         
-        it("Should add MySQL data source without configuration", () => {
+            before(() => {
-            // Select MySQL data source
+            cy.login()
-            cy.selectExternalDatasource(datasource)
+            cy.createTestApp()
-            // Attempt to fetch tables without applying configuration
-            cy.intercept('**/datasources').as('datasource')
-            cy.get(".spectrum-Button")
-            .contains("Save and fetch tables")
-            .click({ force: true })
-            // Intercept Request after button click & apply assertions
-            cy.wait("@datasource")
-            cy.get("@datasource").its('response.body')
-            .should('have.property', 'message', 'connect ECONNREFUSED 127.0.0.1:3306')
-            cy.get("@datasource").its('response.body')
-            .should('have.property', 'status', 500)
-        })
-        
-        it("should add MySQL data source and fetch tables", () => {
-            // Add & configure MySQL data source
-            cy.selectExternalDatasource(datasource)
-            cy.intercept('**/datasources').as('datasource')
-            cy.addDatasourceConfig(datasource)
-            // Check response from datasource after adding configuration
-            cy.wait("@datasource")
-            cy.get("@datasource").its('response.statusCode')
-            .should('eq', 200)
-            // Confirm fetch tables was successful
-            cy.get(".spectrum-Table-body").eq(0)
-            .find('tr')
-            .its('length')
-            .should('be.gt', 0)
-        })
-        
-        it("should check table fetching error", () => {
-            // MySQL test data source contains tables without primary keys
-            cy.get(".spectrum-InLineAlert")
-            .should('contain', 'Error fetching tables')
-            .and('contain', 'No primary key constraint found')
-        })
-        
-        it("should define a One relationship type", () => {
-            // Select relationship type & configure
-            cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
-            cy.get(".spectrum-Dialog-grid").within(() => {
-                cy.get(".spectrum-Picker").eq(0).click()
-                cy.get(".spectrum-Popover").contains("One").click()
-                cy.get(".spectrum-Picker").eq(1).click()
-                cy.get(".spectrum-Popover").contains("REGIONS").click()
-                cy.get(".spectrum-Picker").eq(2).click()
-                cy.get(".spectrum-Popover").contains("REGION_ID").click()
-                cy.get(".spectrum-Picker").eq(3).click()
-                cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-                cy.get(".spectrum-Picker").eq(4).click()
-                cy.get(".spectrum-Popover").contains("REGION_ID").click()
-                // Save relationship & reload page
-                cy.get(".spectrum-Button").contains("Save").click({ force: true })
-                cy.reload()
             })
-            // Confirm table length & column name
+            const datasource = "MySQL"
-            cy.get(".spectrum-Table-body").eq(1)
+            const queryName = "Cypress Test Query"
-            .find('tr')
+            const queryRename = "CT Query Rename"
-            .its('length')
-            .should('eq', 1)
-            cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
-        })
             
-        it("should define a Many relationship type", () => {
+            it("Should add MySQL data source without configuration", () => {
-            // Select relationship type & configure
+                // Select MySQL data source
-            cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.selectExternalDatasource(datasource)
-            cy.get(".spectrum-Dialog-grid").within(() => {
+                // Attempt to fetch tables without applying configuration
-                cy.get(".spectrum-Picker").eq(0).click()
+                cy.intercept('**/datasources').as('datasource')
-                cy.get(".spectrum-Popover").contains("Many").click()
+                cy.get(".spectrum-Button")
-                cy.get(".spectrum-Picker").eq(1).click()
+                .contains("Save and fetch tables")
-                cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                .click({ force: true })
-                cy.get(".spectrum-Picker").eq(2).click()
+                // Intercept Request after button click & apply assertions
-                cy.get(".spectrum-Popover").contains("REGIONS").click()
+                cy.wait("@datasource")
-                cy.get(".spectrum-Picker").eq(3).click()
+                cy.get("@datasource").its('response.body')
-                cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                .should('have.property', 'message', 'connect ECONNREFUSED 127.0.0.1:3306')
-                cy.get(".spectrum-Picker").eq(4).click()
+                cy.get("@datasource").its('response.body')
-                cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                .should('have.property', 'status', 500)
-                cy.get(".spectrum-Picker").eq(5).click()
-                cy.get(".spectrum-Popover").contains("REGION_ID").click()
-                // Save relationship & reload page
-                cy.get(".spectrum-Button").contains("Save").click({ force: true })
-                cy.reload()
-                cy.wait(1000)
             })
-            // Confirm table length & relationship name
-            cy.get(".spectrum-Table-body").eq(1)
-            .find('tr')
-            .its('length')
-            .should('eq', 2)
-            cy.get(".spectrum-Table-cell")
-            .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
-        })
             
-        it("should delete relationships", () => {
+            it("should add MySQL data source and fetch tables", () => {
-            // Delete both relationships
+                // Add & configure MySQL data source
-            cy.get(".spectrum-Table-body")
+                cy.selectExternalDatasource(datasource)
-            .eq(1).find('tr').its('length')
+                cy.intercept('**/datasources').as('datasource')
-            .then((len) => {
+                cy.addDatasourceConfig(datasource)
-                for (let i = 0; i < len; i++) {
+                // Check response from datasource after adding configuration
-                    cy.get(".spectrum-Table-body").eq(1).within(() => {
+                cy.wait("@datasource")
-                        cy.get(".spectrum-Table-row").eq(0).click()
+                cy.get("@datasource").its('response.statusCode')
-                        cy.wait(500)
+                .should('eq', 200)
-                    })
+                // Confirm fetch tables was successful
-                    cy.get(".spectrum-Dialog-grid").within(() => {
+                cy.get(".spectrum-Table-body").eq(0)
-                        cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                .find('tr')
-                    })
+                .its('length')
+                .should('be.gt', 0)
+            })
+            
+            it("should check table fetching error", () => {
+                // MySQL test data source contains tables without primary keys
+                cy.get(".spectrum-InLineAlert")
+                .should('contain', 'Error fetching tables')
+                .and('contain', 'No primary key constraint found')
+            })
+            
+            it("should define a One relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("One").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
                     cy.reload()
-                }
-                // Confirm relationships no longer exist
-                cy.get(".spectrum-Body").should('contain', 'No relationships configured')
-            })
-        })
-        
-        it("should add a query", () => {
-            // Add query
-            cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-            cy.get(".spectrum-Form-item").eq(0).within(() => {
-                cy.get("input").type(queryName)
-            })
-            // Insert Query within Fields section
-            cy.get(".CodeMirror textarea").eq(0)
-            .type("SELECT * FROM books", { force: true })
-            // Intercept query execution
-            cy.intercept('**/queries/preview').as('query')
-            cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
-            cy.wait(500)
-            cy.wait("@query")
-            // Assert against Status Code & Body
-            cy.get("@query").its('response.statusCode')
-            .should('eq', 200)
-            cy.get("@query").its('response.body')
-            .should('not.be.empty')
-            // Save query
-            cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-            cy.get(".nav-item").should('contain', queryName)
-        })
-        
-        it("should duplicate a query", () => {
-            // Get last nav item - The query
-            cy.get(".nav-item").last().within(() => {
-                    cy.get(".icon").eq(1).click({ force: true })
                 })
-            // Select and confirm duplication
+                // Confirm table length & column name
-            cy.get(".spectrum-Menu").contains("Duplicate").click()
+                cy.get(".spectrum-Table-body").eq(1)
-            cy.get(".nav-item").should('contain', queryName + ' (1)')
+                .find('tr')
-        })
+                .its('length')
-        
+                .should('eq', 1)
-        it("should edit a query name", () => {
+                cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
-            // Rename query
-            cy.get(".spectrum-Form-item").eq(0).within(() => {
-                cy.get("input").clear().type(queryRename)
             })
-            // Save query
-            cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-            cy.get(".nav-item").should('contain', queryRename)
-        })
             
-        it("should delete a query", () => {
+            it("should define a Many relationship type", () => {
-            // Get last nav item - The query
+                // Select relationship type & configure
-            for (let i = 0; i < 2; i++) {
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("Many").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                    cy.get(".spectrum-Picker").eq(5).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                    cy.wait(1000)
+                })
+                // Confirm table length & relationship name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 2)
+                cy.get(".spectrum-Table-cell")
+                .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
+            })
+            
+            it("should delete relationships", () => {
+                // Delete both relationships
+                cy.get(".spectrum-Table-body")
+                .eq(1).find('tr').its('length')
+                .then((len) => {
+                    for (let i = 0; i < len; i++) {
+                        cy.get(".spectrum-Table-body").eq(1).within(() => {
+                            cy.get(".spectrum-Table-row").eq(0).click()
+                            cy.wait(500)
+                        })
+                        cy.get(".spectrum-Dialog-grid").within(() => {
+                            cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                        })
+                        cy.reload()
+                    }
+                    // Confirm relationships no longer exist
+                    cy.get(".spectrum-Body").should('contain', 'No relationships configured')
+                })
+            })
+            
+            it("should add a query", () => {
+                // Add query
+                cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").type(queryName)
+                })
+                // Insert Query within Fields section
+                cy.get(".CodeMirror textarea").eq(0)
+                .type("SELECT * FROM books", { force: true })
+                // Intercept query execution
+                cy.intercept('**/queries/preview').as('query')
+                cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+                cy.wait(500)
+                cy.wait("@query")
+                // Assert against Status Code & Body
+                cy.get("@query").its('response.statusCode')
+                .should('eq', 200)
+                cy.get("@query").its('response.body')
+                .should('not.be.empty')
+                // Save query
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryName)
+            })
+            
+            it("should duplicate a query", () => {
+                // Get last nav item - The query
                 cy.get(".nav-item").last().within(() => {
-                    cy.get(".icon").eq(1).click({ force: true })
+                        cy.get(".icon").eq(1).click({ force: true })
+                    })
+                // Select and confirm duplication
+                cy.get(".spectrum-Menu").contains("Duplicate").click()
+                cy.get(".nav-item").should('contain', queryName + ' (1)')
+            })
+            
+            it("should edit a query name", () => {
+                // Rename query
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").clear().type(queryRename)
                 })
-                // Select Delete
+                // Save query
-                cy.get(".spectrum-Menu").contains("Delete").click()
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-                cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryRename)
-                cy.wait(1000)
+            })
-            }
+            
-            // Confirm deletion
+            it("should delete a query", () => {
-            cy.get(".nav-item").should('not.contain', queryName)
+                // Get last nav item - The query
-            cy.get(".nav-item").should('not.contain', queryRename)
+                for (let i = 0; i < 2; i++) {
-        })
+                    cy.get(".nav-item").last().within(() => {
-    }
+                        cy.get(".icon").eq(1).click({ force: true })
+                    })
+                    // Select Delete
+                    cy.get(".spectrum-Menu").contains("Delete").click()
+                    cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+                    cy.wait(1000)
+                }
+                // Confirm deletion
+                cy.get(".nav-item").should('not.contain', queryName)
+                cy.get(".nav-item").should('not.contain', queryRename)
+            })
+        }
+    })
 })

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

@@ -1,191 +1,195 @@
-context("Oracle Datasource Testing", () => {
+import filterTests from "../../support/filterTests"
-    before(() => {
-    cy.login()
-    cy.createTestApp()
-    })
-    const datasource = "Oracle"
-    const queryName = "Cypress Test Query"
-    const queryRename = "CT Query Rename"
 
-    it("Should add Oracle data source and skip table fetch", () => {
+filterTests(['all', 'smoke'], () => {
-        // Select Oracle data source
+    context("Oracle Datasource Testing", () => {
-        cy.selectExternalDatasource(datasource)
+        before(() => {
-        // Skip table fetch - no config added
+        cy.login()
-        cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
+        cy.createTestApp()
-        cy.wait(500)
-        // Confirm config contains localhost
-        cy.get(".spectrum-Textfield-input").eq(1).should('have.value', 'localhost')
-        // Add another Oracle data source, configure & skip table fetch
-        cy.selectExternalDatasource(datasource)
-        cy.addDatasourceConfig(datasource, true)
-        // Confirm config and no tables
-        cy.get(".spectrum-Textfield-input").eq(1).should('have.value', Cypress.env("oracle").HOST)
-        cy.get(".spectrum-Body").eq(2).should('contain', 'No tables found.')
-    })
-    
-    it("Should add Oracle data source and fetch tables without configuration", () => {
-        // Select Oracle data source
-        cy.selectExternalDatasource(datasource)
-        // Attempt to fetch tables without applying configuration
-        cy.intercept('**/datasources').as('datasource')
-        cy.get(".spectrum-Button")
-        .contains("Save and fetch tables")
-        .click({ force: true })
-        // Intercept Request after button click & apply assertions
-        cy.wait("@datasource")
-        cy.get("@datasource").its('response.body')
-        .should('have.property', 'message', 'NJS-007: invalid value for "user" in parameter 1')
-        cy.get("@datasource").its('response.body')
-        .should('have.property', 'status', 500)
-    })
-    
-    it("should add Oracle data source and fetch tables", () => {
-        // Add & configure Oracle data source
-        cy.selectExternalDatasource(datasource)
-        cy.intercept('**/datasources').as('datasource')
-        cy.addDatasourceConfig(datasource)
-        // Check response from datasource after adding configuration
-        cy.wait("@datasource")
-        cy.get("@datasource").its('response.statusCode')
-        .should('eq', 200)
-        // Confirm fetch tables was successful
-        cy.get(".spectrum-Table-body").eq(0)
-        .find('tr')
-        .its('length')
-        .should('be.gt', 0)
-    })
-    
-    it("should define a One relationship type", () => {
-        // Select relationship type & configure
-        cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get(".spectrum-Picker").eq(0).click()
-            cy.get(".spectrum-Popover").contains("One").click()
-            cy.get(".spectrum-Picker").eq(1).click()
-            cy.get(".spectrum-Popover").contains("REGIONS").click()
-            cy.get(".spectrum-Picker").eq(2).click()
-            cy.get(".spectrum-Popover").contains("REGION_ID").click()
-            cy.get(".spectrum-Picker").eq(3).click()
-            cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-            cy.get(".spectrum-Picker").eq(4).click()
-            cy.get(".spectrum-Popover").contains("REGION_ID").click()
-            // Save relationship & reload page
-            cy.get(".spectrum-Button").contains("Save").click({ force: true })
-            cy.reload()
         })
-        // Confirm table length & column name
+        const datasource = "Oracle"
-        cy.get(".spectrum-Table-body").eq(1)
+        const queryName = "Cypress Test Query"
-        .find('tr')
+        const queryRename = "CT Query Rename"
-        .its('length')
-        .should('eq', 1)
-        cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
-    })
         
-    it("should define a Many relationship type", () => {
+        it("Should add Oracle data source and skip table fetch", () => {
-        // Select relationship type & configure
+            // Select Oracle data source
-        cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+            cy.selectExternalDatasource(datasource)
-        cy.get(".spectrum-Dialog-grid").within(() => {
+            // Skip table fetch - no config added
-            cy.get(".spectrum-Picker").eq(0).click()
+            cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true })
-            cy.get(".spectrum-Popover").contains("Many").click()
+            cy.wait(500)
-            cy.get(".spectrum-Picker").eq(1).click()
+            // Confirm config contains localhost
-            cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+            cy.get(".spectrum-Textfield-input").eq(1).should('have.value', 'localhost')
-            cy.get(".spectrum-Picker").eq(2).click()
+            // Add another Oracle data source, configure & skip table fetch
-            cy.get(".spectrum-Popover").contains("REGIONS").click()
+            cy.selectExternalDatasource(datasource)
-            cy.get(".spectrum-Picker").eq(3).click()
+            cy.addDatasourceConfig(datasource, true)
-            cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+            // Confirm config and no tables
-            cy.get(".spectrum-Picker").eq(4).click()
+            cy.get(".spectrum-Textfield-input").eq(1).should('have.value', Cypress.env("oracle").HOST)
-            cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+            cy.get(".spectrum-Body").eq(2).should('contain', 'No tables found.')
-            cy.get(".spectrum-Picker").eq(5).click()
-            cy.get(".spectrum-Popover").contains("REGION_ID").click()
-            // Save relationship & reload page
-            cy.get(".spectrum-Button").contains("Save").click({ force: true })
-            cy.reload()
         })
-        // Confirm table length & relationship name
-        cy.get(".spectrum-Table-body").eq(1)
-        .find('tr')
-        .its('length')
-        .should('eq', 2)
-        cy.get(".spectrum-Table-cell")
-        .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
-    })
         
-    it("should delete relationships", () => {
+        it("Should add Oracle data source and fetch tables without configuration", () => {
-        // Delete both relationships
+            // Select Oracle data source
-        cy.get(".spectrum-Table-body")
+            cy.selectExternalDatasource(datasource)
-        .eq(1).find('tr').its('length')
+            // Attempt to fetch tables without applying configuration
-        .then((len) => {
+            cy.intercept('**/datasources').as('datasource')
-            for (let i = 0; i < len; i++) {
+            cy.get(".spectrum-Button")
-                cy.get(".spectrum-Table-body").eq(1).within(() => {
+            .contains("Save and fetch tables")
-                    cy.get(".spectrum-Table-row").eq(0).click()
+            .click({ force: true })
-                    cy.wait(500)
+            // Intercept Request after button click & apply assertions
-                })
+            cy.wait("@datasource")
-                cy.get(".spectrum-Dialog-grid").within(() => {
+            cy.get("@datasource").its('response.body')
-                    cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+            .should('have.property', 'message', 'NJS-007: invalid value for "user" in parameter 1')
-                })
+            cy.get("@datasource").its('response.body')
+            .should('have.property', 'status', 500)
+        })
+        
+        it("should add Oracle data source and fetch tables", () => {
+            // Add & configure Oracle data source
+            cy.selectExternalDatasource(datasource)
+            cy.intercept('**/datasources').as('datasource')
+            cy.addDatasourceConfig(datasource)
+            // Check response from datasource after adding configuration
+            cy.wait("@datasource")
+            cy.get("@datasource").its('response.statusCode')
+            .should('eq', 200)
+            // Confirm fetch tables was successful
+            cy.get(".spectrum-Table-body").eq(0)
+            .find('tr')
+            .its('length')
+            .should('be.gt', 0)
+        })
+        
+        it("should define a One relationship type", () => {
+            // Select relationship type & configure
+            cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+            cy.get(".spectrum-Dialog-grid").within(() => {
+                cy.get(".spectrum-Picker").eq(0).click()
+                cy.get(".spectrum-Popover").contains("One").click()
+                cy.get(".spectrum-Picker").eq(1).click()
+                cy.get(".spectrum-Popover").contains("REGIONS").click()
+                cy.get(".spectrum-Picker").eq(2).click()
+                cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                cy.get(".spectrum-Picker").eq(3).click()
+                cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                cy.get(".spectrum-Picker").eq(4).click()
+                cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                // Save relationship & reload page
+                cy.get(".spectrum-Button").contains("Save").click({ force: true })
                 cy.reload()
-            }
+            })
-            // Confirm relationships no longer exist
+            // Confirm table length & column name
-            cy.get(".spectrum-Body").should('contain', 'No relationships configured')
+            cy.get(".spectrum-Table-body").eq(1)
-        })
+            .find('tr')
-    })
+            .its('length')
-    
+            .should('eq', 1)
-    it("should add a query", () => {
+            cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
-        // Add query
-        cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-        cy.get(".spectrum-Form-item").eq(0).within(() => {
-            cy.get("input").type(queryName)
-        })
-        // Insert Query within Fields section
-        cy.get(".CodeMirror textarea").eq(0)
-        .type("SELECT * FROM JOBS", { force: true })
-        // Intercept query execution
-        cy.intercept('**/queries/preview').as('query')
-        cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
-        cy.wait(500)
-        cy.wait("@query")
-        // Assert against Status Code & Body
-        cy.get("@query").its('response.statusCode')
-        .should('eq', 200)
-        cy.get("@query").its('response.body')
-        .should('not.be.empty')
-        // Save query
-        cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        cy.get(".nav-item").should('contain', queryName)
-    })
-    
-    it("should duplicate a query", () => {
-        // Get query nav item
-        cy.get(".nav-item").contains(queryName).parent().within(() => {
-            cy.get(".spectrum-Icon").eq(1).click({ force: true })  
-        })
-        // Select and confirm duplication
-        cy.get(".spectrum-Menu").contains("Duplicate").click()
-        cy.get(".nav-item").should('contain', queryName + ' (1)')
-    })
-    
-    it("should edit a query name", () => {
-        // Rename query
-        cy.get(".spectrum-Form-item").eq(0).within(() => {
-            cy.get("input").clear().type(queryRename)
-        })
-        // Save query
-        cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        cy.get(".nav-item").should('contain', queryRename)
-    })
-    
-    it("should delete a query", () => {
-        // Get query nav item - QueryName
-        cy.get(".nav-item").contains(queryName).parent().within(() => {
-            cy.get(".spectrum-Icon").eq(1).click({ force: true })  
         })
         
-        // Select Delete
+        it("should define a Many relationship type", () => {
-        cy.get(".spectrum-Menu").contains("Delete").click()
+            // Select relationship type & configure
-        cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+            cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
-        cy.wait(1000)
+            cy.get(".spectrum-Dialog-grid").within(() => {
+                cy.get(".spectrum-Picker").eq(0).click()
+                cy.get(".spectrum-Popover").contains("Many").click()
+                cy.get(".spectrum-Picker").eq(1).click()
+                cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                cy.get(".spectrum-Picker").eq(2).click()
+                cy.get(".spectrum-Popover").contains("REGIONS").click()
+                cy.get(".spectrum-Picker").eq(3).click()
+                cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                cy.get(".spectrum-Picker").eq(4).click()
+                cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                cy.get(".spectrum-Picker").eq(5).click()
+                cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                // Save relationship & reload page
+                cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                cy.reload()
+            })
+            // Confirm table length & relationship name
+            cy.get(".spectrum-Table-body").eq(1)
+            .find('tr')
+            .its('length')
+            .should('eq', 2)
+            cy.get(".spectrum-Table-cell")
+            .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
+        })
         
-        // Confirm deletion
+        it("should delete relationships", () => {
-        cy.get(".nav-item").should('not.contain', queryName)
+            // Delete both relationships
+            cy.get(".spectrum-Table-body")
+            .eq(1).find('tr').its('length')
+            .then((len) => {
+                for (let i = 0; i < len; i++) {
+                    cy.get(".spectrum-Table-body").eq(1).within(() => {
+                        cy.get(".spectrum-Table-row").eq(0).click()
+                        cy.wait(500)
+                    })
+                    cy.get(".spectrum-Dialog-grid").within(() => {
+                        cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                    })
+                    cy.reload()
+                }
+                // Confirm relationships no longer exist
+                cy.get(".spectrum-Body").should('contain', 'No relationships configured')
+            })
+        })
+        
+        it("should add a query", () => {
+            // Add query
+            cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+            cy.get(".spectrum-Form-item").eq(0).within(() => {
+                cy.get("input").type(queryName)
+            })
+            // Insert Query within Fields section
+            cy.get(".CodeMirror textarea").eq(0)
+            .type("SELECT * FROM JOBS", { force: true })
+            // Intercept query execution
+            cy.intercept('**/queries/preview').as('query')
+            cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+            cy.wait(500)
+            cy.wait("@query")
+            // Assert against Status Code & Body
+            cy.get("@query").its('response.statusCode')
+            .should('eq', 200)
+            cy.get("@query").its('response.body')
+            .should('not.be.empty')
+            // Save query
+            cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+            cy.get(".nav-item").should('contain', queryName)
+        })
+        
+        it("should duplicate a query", () => {
+            // Get query nav item
+            cy.get(".nav-item").contains(queryName).parent().within(() => {
+                cy.get(".spectrum-Icon").eq(1).click({ force: true })  
+            })
+            // Select and confirm duplication
+            cy.get(".spectrum-Menu").contains("Duplicate").click()
+            cy.get(".nav-item").should('contain', queryName + ' (1)')
+        })
+        
+        it("should edit a query name", () => {
+            // Rename query
+            cy.get(".spectrum-Form-item").eq(0).within(() => {
+                cy.get("input").clear().type(queryRename)
+            })
+            // Save query
+            cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+            cy.get(".nav-item").should('contain', queryRename)
+        })
+        
+        it("should delete a query", () => {
+            // Get query nav item - QueryName
+            cy.get(".nav-item").contains(queryName).parent().within(() => {
+                cy.get(".spectrum-Icon").eq(1).click({ force: true })  
+            })
+            
+            // Select Delete
+            cy.get(".spectrum-Menu").contains("Delete").click()
+            cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+            cy.wait(1000)
+            
+            // Confirm deletion
+            cy.get(".nav-item").should('not.contain', queryName)
+        })
     })
 })

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

@@ -1,237 +1,241 @@
-context("PostgreSQL Datasource Testing", () => {
+import filterTests from "../../support/filterTests"
-    if (Cypress.env("TEST_ENV")) {
 
-        before(() => {
+filterTests(['all'], () => {
-        cy.login()
+    context("PostgreSQL Datasource Testing", () => {
-        cy.createTestApp()
+        if (Cypress.env("TEST_ENV")) {
-        })
-        const datasource = "PostgreSQL"
-        const queryName = "Cypress Test Query"
-        const queryRename = "CT Query Rename"
         
-        it("Should add PostgreSQL data source without configuration", () => {
+            before(() => {
-            // Select PostgreSQL data source
+            cy.login()
-            cy.selectExternalDatasource(datasource)
+            cy.createTestApp()
-            // Attempt to fetch tables without applying configuration
-            cy.intercept('**/datasources').as('datasource')
-            cy.get(".spectrum-Button")
-            .contains("Save and fetch tables")
-            .click({ force: true })
-            // Intercept Request after button click & apply assertions
-            cy.wait("@datasource")
-            cy.get("@datasource").its('response.body')
-            .should('have.property', 'message', 'connect ECONNREFUSED 127.0.0.1:5432')
-            cy.get("@datasource").its('response.body')
-            .should('have.property', 'status', 500)
-        })
-        
-        it("should add PostgreSQL data source and fetch tables", () => {
-            // Add & configure PostgreSQL data source
-            cy.selectExternalDatasource(datasource)
-            cy.intercept('**/datasources').as('datasource')
-            cy.addDatasourceConfig(datasource)
-            // Check response from datasource after adding configuration
-            cy.wait("@datasource")
-            cy.get("@datasource").its('response.statusCode')
-            .should('eq', 200)
-            // Confirm fetch tables was successful
-            cy.get(".spectrum-Table-body").eq(0)
-            .find('tr')
-            .its('length')
-            .should('be.gt', 0)
-        })
-        
-        it("should define a One relationship type", () => {
-            // Select relationship type & configure
-            cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
-            cy.get(".spectrum-Dialog-grid").within(() => {
-                cy.get(".spectrum-Picker").eq(0).click()
-                cy.get(".spectrum-Popover").contains("One").click()
-                cy.get(".spectrum-Picker").eq(1).click()
-                cy.get(".spectrum-Popover").contains("REGIONS").click()
-                cy.get(".spectrum-Picker").eq(2).click()
-                cy.get(".spectrum-Popover").contains("REGION_ID").click()
-                cy.get(".spectrum-Picker").eq(3).click()
-                cy.get(".spectrum-Popover").contains("COUNTRIES").click()
-                cy.get(".spectrum-Picker").eq(4).click()
-                cy.get(".spectrum-Popover").contains("REGION_ID").click()
-                // Save relationship & reload page
-                cy.get(".spectrum-Button").contains("Save").click({ force: true })
-                cy.reload()
             })
-            // Confirm table length & column name
+            const datasource = "PostgreSQL"
-            cy.get(".spectrum-Table-body").eq(1)
+            const queryName = "Cypress Test Query"
-            .find('tr')
+            const queryRename = "CT Query Rename"
-            .its('length')
-            .should('eq', 1)
-            cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
-        })
             
-        it("should define a Many relationship type", () => {
+            it("Should add PostgreSQL data source without configuration", () => {
-            // Select relationship type & configure
+                // Select PostgreSQL data source
-            cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.selectExternalDatasource(datasource)
-            cy.get(".spectrum-Dialog-grid").within(() => {
+                // Attempt to fetch tables without applying configuration
-                cy.get(".spectrum-Picker").eq(0).click()
+                cy.intercept('**/datasources').as('datasource')
-                cy.get(".spectrum-Popover").contains("Many").click()
+                cy.get(".spectrum-Button")
-                cy.get(".spectrum-Picker").eq(1).click()
+                .contains("Save and fetch tables")
-                cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                .click({ force: true })
-                cy.get(".spectrum-Picker").eq(2).click()
+                // Intercept Request after button click & apply assertions
-                cy.get(".spectrum-Popover").contains("REGIONS").click()
+                cy.wait("@datasource")
-                cy.get(".spectrum-Picker").eq(3).click()
+                cy.get("@datasource").its('response.body')
-                cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                .should('have.property', 'message', 'connect ECONNREFUSED 127.0.0.1:5432')
-                cy.get(".spectrum-Picker").eq(4).click()
+                cy.get("@datasource").its('response.body')
-                cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                .should('have.property', 'status', 500)
-                cy.get(".spectrum-Picker").eq(5).click()
-                cy.get(".spectrum-Popover").contains("REGION_ID").click()
-                // Save relationship & reload page
-                cy.get(".spectrum-Button").contains("Save").click({ force: true })
-                cy.reload()
             })
-            // Confirm table length & relationship name
-            cy.get(".spectrum-Table-body").eq(1)
-            .find('tr')
-            .its('length')
-            .should('eq', 2)
-            cy.get(".spectrum-Table-cell")
-            .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
-        })
             
-        it("should delete a relationship", () => {
+            it("should add PostgreSQL data source and fetch tables", () => {
-            cy.get(".hierarchy-items-container").contains(datasource).click()
+                // Add & configure PostgreSQL data source
-            cy.reload()
+                cy.selectExternalDatasource(datasource)
-            // Delete one relationship
+                cy.intercept('**/datasources').as('datasource')
-            cy.get(".spectrum-Table-body").eq(1).within(() => {
+                cy.addDatasourceConfig(datasource)
-                cy.get(".spectrum-Table-row").eq(0).click()
+                // Check response from datasource after adding configuration
+                cy.wait("@datasource")
+                cy.get("@datasource").its('response.statusCode')
+                .should('eq', 200)
+                // Confirm fetch tables was successful
+                cy.get(".spectrum-Table-body").eq(0)
+                .find('tr')
+                .its('length')
+                .should('be.gt', 0)
+            })
+            
+            it("should define a One relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("One").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                })
+                // Confirm table length & column name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 1)
+                cy.get(".spectrum-Table-cell").should('contain', "COUNTRIES to REGIONS")
+            })
+            
+            it("should define a Many relationship type", () => {
+                // Select relationship type & configure
+                cy.get(".spectrum-Button").contains("Define relationship").click({ force: true })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Picker").eq(0).click()
+                    cy.get(".spectrum-Popover").contains("Many").click()
+                    cy.get(".spectrum-Picker").eq(1).click()
+                    cy.get(".spectrum-Popover").contains("LOCATIONS").click()
+                    cy.get(".spectrum-Picker").eq(2).click()
+                    cy.get(".spectrum-Popover").contains("REGIONS").click()
+                    cy.get(".spectrum-Picker").eq(3).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRIES").click()
+                    cy.get(".spectrum-Picker").eq(4).click()
+                    cy.get(".spectrum-Popover").contains("COUNTRY_ID").click()
+                    cy.get(".spectrum-Picker").eq(5).click()
+                    cy.get(".spectrum-Popover").contains("REGION_ID").click()
+                    // Save relationship & reload page
+                    cy.get(".spectrum-Button").contains("Save").click({ force: true })
+                    cy.reload()
+                })
+                // Confirm table length & relationship name
+                cy.get(".spectrum-Table-body").eq(1)
+                .find('tr')
+                .its('length')
+                .should('eq', 2)
+                cy.get(".spectrum-Table-cell")
+                .should('contain', "LOCATIONS through COUNTRIES → REGIONS")
+            })
+            
+            it("should delete a relationship", () => {
+                cy.get(".hierarchy-items-container").contains(datasource).click()
+                cy.reload()
+                // Delete one relationship
+                cy.get(".spectrum-Table-body").eq(1).within(() => {
+                    cy.get(".spectrum-Table-row").eq(0).click()
+                    cy.wait(500)
+                    })
+                cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                    })
+                cy.reload()
+                // Confirm relationship was deleted
+                cy.get(".spectrum-Table-body")
+                .eq(1).find('tr').its('length').should('eq', 1)
+            })
+            
+            it("should add a query", () => {
+                // Add query
+                cy.get(".spectrum-Button").contains("Add query").click({ force: true })
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").type(queryName)
+                })
+                // Insert Query within Fields section
+                cy.get(".CodeMirror textarea").eq(0)
+                .type("SELECT * FROM books", { force: true })
+                // Intercept query execution
+                cy.intercept('**/queries/preview').as('query')
+                cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
                 cy.wait(500)
-                })
+                cy.wait("@query")
-            cy.get(".spectrum-Dialog-grid").within(() => {
+                // Assert against Status Code & Body
-                cy.get(".spectrum-Button").contains("Delete").click({ force: true })
+                cy.get("@query").its('response.statusCode')
-                })
+                .should('eq', 200)
-            cy.reload()
+                cy.get("@query").its('response.body')
-            // Confirm relationship was deleted
+                .should('not.be.empty')
-            cy.get(".spectrum-Table-body")
+                // Save query
-            .eq(1).find('tr').its('length').should('eq', 1)
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-        })
+                cy.get(".hierarchy-items-container").should('contain', queryName)
-        
-        it("should add a query", () => {
-            // Add query
-            cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-            cy.get(".spectrum-Form-item").eq(0).within(() => {
-                cy.get("input").type(queryName)
-            })
-            // Insert Query within Fields section
-            cy.get(".CodeMirror textarea").eq(0)
-            .type("SELECT * FROM books", { force: true })
-            // Intercept query execution
-            cy.intercept('**/queries/preview').as('query')
-            cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
-            cy.wait(500)
-            cy.wait("@query")
-            // Assert against Status Code & Body
-            cy.get("@query").its('response.statusCode')
-            .should('eq', 200)
-            cy.get("@query").its('response.body')
-            .should('not.be.empty')
-            // Save query
-            cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
-            cy.get(".hierarchy-items-container").should('contain', queryName)
-        })
-        
-        it("should switch to schema with no tables", () => {
-            // Switch Schema - To one without any tables
-            cy.get(".hierarchy-items-container").contains(datasource).click()
-            switchSchema("randomText")
-            
-            // No tables displayed
-            cy.get(".spectrum-Body").eq(2).should('contain', 'No tables found')
-            
-            // Previously created query should be visible
-            cy.get(".spectrum-Table-body").should('contain', queryName)
-        })
-        
-        it("should switch schemas", () => {
-            // Switch schema - To one with tables
-            switchSchema("1")
-            
-            // Confirm tables exist - Check for specific one
-            cy.get(".spectrum-Table-body").eq(0).should('contain', 'test')
-            cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').should('eq', 1)
-            
-            // Confirm specific table visible within left nav bar
-            cy.get(".hierarchy-items-container").should('contain', 'test')
-            
-            // Switch back to public schema
-            switchSchema("public")
-            
-            // Confirm tables exist - again
-            cy.get(".spectrum-Table-body").eq(0).should('contain', 'REGIONS')
-            cy.get(".spectrum-Table-body").eq(0)
-            .find('tr').its('length').should('be.gt', 1)
-            
-            // Confirm specific table visible within left nav bar
-            cy.get(".hierarchy-items-container").should('contain', 'REGIONS')
-            
-            // No relationships and one query
-            cy.get(".spectrum-Body").eq(3).should('contain', 'No relationships configured.')
-            cy.get(".spectrum-Table-body").eq(1).should('contain', queryName)
-        })
-        
-        it("should duplicate a query", () => {
-            // Get last nav item - The query
-            cy.get(".nav-item").last().within(() => {
-                    cy.get(".icon").eq(1).click({ force: true })
-                })
-            // Select and confirm duplication
-            cy.get(".spectrum-Menu").contains("Duplicate").click()
-            cy.get(".nav-item").should('contain', queryName + ' (1)')
-        })
-        
-        it("should edit a query name", () => {
-            // Access query
-            cy.get(".hierarchy-items-container").contains(queryName + ' (1)').click()
-            
-            // Rename query
-            cy.get(".spectrum-Form-item").eq(0).within(() => {
-                cy.get("input").clear().type(queryRename)
             })
             
-            // Run and Save query
+            it("should switch to schema with no tables", () => {
-            cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+                // Switch Schema - To one without any tables
-            cy.wait(500)
+                cy.get(".hierarchy-items-container").contains(datasource).click()
-            cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                switchSchema("randomText")
-            cy.get(".nav-item").should('contain', queryRename)
-        })
                 
-        it("should delete a query", () => {
+                // No tables displayed
-            // Get last nav item - The query
+                cy.get(".spectrum-Body").eq(2).should('contain', 'No tables found')
-            for (let i = 0; i < 2; i++) {
+                
+                // Previously created query should be visible
+                cy.get(".spectrum-Table-body").should('contain', queryName)
+            })
+            
+            it("should switch schemas", () => {
+                // Switch schema - To one with tables
+                switchSchema("1")
+                
+                // Confirm tables exist - Check for specific one
+                cy.get(".spectrum-Table-body").eq(0).should('contain', 'test')
+                cy.get(".spectrum-Table-body").eq(0).find('tr').its('length').should('eq', 1)
+                
+                // Confirm specific table visible within left nav bar
+                cy.get(".hierarchy-items-container").should('contain', 'test')
+                
+                // Switch back to public schema
+                switchSchema("public")
+                
+                // Confirm tables exist - again
+                cy.get(".spectrum-Table-body").eq(0).should('contain', 'REGIONS')
+                cy.get(".spectrum-Table-body").eq(0)
+                .find('tr').its('length').should('be.gt', 1)
+                
+                // Confirm specific table visible within left nav bar
+                cy.get(".hierarchy-items-container").should('contain', 'REGIONS')
+                
+                // No relationships and one query
+                cy.get(".spectrum-Body").eq(3).should('contain', 'No relationships configured.')
+                cy.get(".spectrum-Table-body").eq(1).should('contain', queryName)
+            })
+            
+            it("should duplicate a query", () => {
+                // Get last nav item - The query
                 cy.get(".nav-item").last().within(() => {
-                    cy.get(".icon").eq(1).click({ force: true })
+                        cy.get(".icon").eq(1).click({ force: true })
-                })
+                    })
-                // Select Delete
+                // Select and confirm duplication
-                cy.get(".spectrum-Menu").contains("Delete").click()
+                cy.get(".spectrum-Menu").contains("Duplicate").click()
-                cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryName + ' (1)')
-                cy.wait(1000)
+            })
-            }
-            // Confirm deletion
-            cy.get(".nav-item").should('not.contain', queryName)
-            cy.get(".nav-item").should('not.contain', queryRename)
-        })
             
-        const switchSchema = (schema) => {
+            it("should edit a query name", () => {
-            // Edit configuration - Change Schema
+                // Access query
-            cy.get(".spectrum-Textfield").eq(6).within(() => {
+                cy.get(".hierarchy-items-container").contains(queryName + ' (1)').click()
-                cy.get('input').clear().type(schema)
+                
+                // Rename query
+                cy.get(".spectrum-Form-item").eq(0).within(() => {
+                    cy.get("input").clear().type(queryRename)
+                })
+                
+                // Run and Save query
+                cy.get(".spectrum-Button").contains("Run Query").click({ force: true })
+                cy.wait(500)
+                cy.get(".spectrum-Button").contains("Save Query").click({ force: true })
+                cy.get(".nav-item").should('contain', queryRename)
             })
-            // Save configuration & fetch
+            
-            cy.get(".spectrum-Button").contains("Save").click({ force: true })
+            it("should delete a query", () => {
-            cy.get(".spectrum-Button").contains("Fetch tables").click({ force: true })
+                // Get last nav item - The query
-            // Click fetch tables again within modal
+                for (let i = 0; i < 2; i++) {
-            cy.get(".spectrum-Dialog-grid").within(() => {
+                    cy.get(".nav-item").last().within(() => {
+                        cy.get(".icon").eq(1).click({ force: true })
+                    })
+                    // Select Delete
+                    cy.get(".spectrum-Menu").contains("Delete").click()
+                    cy.get(".spectrum-Button").contains("Delete Query").click({ force: true })
+                    cy.wait(1000)
+                }
+                // Confirm deletion
+                cy.get(".nav-item").should('not.contain', queryName)
+                cy.get(".nav-item").should('not.contain', queryRename)
+            })
+            
+            const switchSchema = (schema) => {
+                // Edit configuration - Change Schema
+                cy.get(".spectrum-Textfield").eq(6).within(() => {
+                    cy.get('input').clear().type(schema)
+                })
+                // Save configuration & fetch
+                cy.get(".spectrum-Button").contains("Save").click({ force: true })
                 cy.get(".spectrum-Button").contains("Fetch tables").click({ force: true })
-            })
+                // Click fetch tables again within modal
-            cy.reload()
+                cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.wait(5000)
+                    cy.get(".spectrum-Button").contains("Fetch tables").click({ force: true })
+                })
+                cy.reload()
+                cy.wait(5000)
+            }
         }
-    }
+    })
 })

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

@@ -1,39 +1,43 @@
-context("REST Datasource Testing", () => {
+import filterTests from "../../support/filterTests"
-    before(() => {
-      cy.login()
-      cy.createTestApp()
-    })
 
-    const datasource = "REST"
+filterTests(['smoke', 'all'], () => {
-    const restUrl = "https://api.openbrewerydb.org/breweries"
+    context("REST Datasource Testing", () => {
+        before(() => {
+          cy.login()
+          cy.createTestApp()
+        })
         
-    it("Should add REST data source with incorrect API", () => {
+        const datasource = "REST"
-        // Select REST data source
+        const restUrl = "https://api.openbrewerydb.org/breweries"
-        cy.selectExternalDatasource(datasource)
-        // Enter incorrect api & attempt to send query
-        cy.wait(500)
-        cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-        cy.intercept('**/preview').as('queryError')
-        cy.get("input").clear().type("random text")
-        cy.get(".spectrum-Button").contains("Send").click({ force: true })
-        // Intercept Request after button click & apply assertions
-        cy.wait("@queryError")
-        cy.get("@queryError").its('response.body')
-        .should('have.property', 'message', 'request to http://random/%20text? failed, reason: getaddrinfo ENOTFOUND random')
-        cy.get("@queryError").its('response.body')
-        .should('have.property', 'status', 400)
-    })
         
-    it("should add and configure a REST datasource", () => {
+        it("Should add REST data source with incorrect API", () => {
-        // Select REST datasource and create query
+            // Select REST data source
-        cy.selectExternalDatasource(datasource)
+            cy.selectExternalDatasource(datasource)
-        cy.wait(500)
+            // Enter incorrect api & attempt to send query
-        // createRestQuery confirms query creation
+            cy.wait(500)
-        cy.createRestQuery("GET", restUrl)
+            cy.get(".spectrum-Button").contains("Add query").click({ force: true })
-        // Confirm status code response within REST datasource
+            cy.intercept('**/preview').as('queryError')
-        cy.get(".spectrum-FieldLabel")
+            cy.get("input").clear().type("random text")
-        .contains("Status")
+            cy.get(".spectrum-Button").contains("Send").click({ force: true })
-        .children()
+            // Intercept Request after button click & apply assertions
-        .should('contain', 200)
+            cy.wait("@queryError")
+            cy.get("@queryError").its('response.body')
+            .should('have.property', 'message', 'request to http://random/%20text? failed, reason: getaddrinfo ENOTFOUND random')
+            cy.get("@queryError").its('response.body')
+            .should('have.property', 'status', 400)
+        })
+        
+        it("should add and configure a REST datasource", () => {
+            // Select REST datasource and create query
+            cy.selectExternalDatasource(datasource)
+            cy.wait(500)
+            // createRestQuery confirms query creation
+            cy.createRestQuery("GET", restUrl)
+            // Confirm status code response within REST datasource
+            cy.get(".spectrum-FieldLabel")
+            .contains("Status")
+            .children()
+            .should('contain', 200)
+        })
     })
 })

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

@@ -1,19 +1,48 @@
-context("Query Level Transformers", () => {
+import filterTests from "../support/filterTests"
-  before(() => {
-    cy.login()
-    cy.deleteApp("Cypress Tests")
-    cy.createApp("Cypress Tests")
-  })
 
-  it("should write a transformer function", () => {
+filterTests(['smoke', 'all'], () => {
+  context("Query Level Transformers", () => {
+    before(() => {
+      cy.login()
+      cy.deleteApp("Cypress Tests")
+      cy.createApp("Cypress Tests")
+    })
+      
+    it("should write a transformer function", () => {
+        // Add REST datasource - contains API for breweries
+        const datasource = "REST"
+        const restUrl = "https://api.openbrewerydb.org/breweries"
+        cy.selectExternalDatasource(datasource)
+        cy.createRestQuery("GET", restUrl)
+        cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
+        // Get Transformer Function from file
+        cy.readFile("cypress/support/queryLevelTransformerFunction.js").then((transformerFunction) => {
+          cy.get(".CodeMirror textarea")
+          // Highlight current text and overwrite with file contents
+          .type(Cypress.platform === 'darwin' ? '{cmd}a' : '{ctrl}a', { force: true })
+          .type(transformerFunction, { parseSpecialCharSequences: false })
+        })
+        // Send Query
+        cy.intercept('**/queries/preview').as('query')
+        cy.get(".spectrum-Button").contains("Send").click({ force: true })
+        cy.wait("@query")
+        // Assert against Status Code, body, & body rows
+        cy.get("@query").its('response.statusCode')
+        .should('eq', 200)
+        cy.get("@query").its('response.body').should('not.be.empty')
+        cy.get("@query").its('response.body.rows').should('not.be.empty')
+      })
+        
+    it("should add data to the previous query", () => {
       // Add REST datasource - contains API for breweries
       const datasource = "REST"
       const restUrl = "https://api.openbrewerydb.org/breweries"
       cy.selectExternalDatasource(datasource)
       cy.createRestQuery("GET", restUrl)
       cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
-      // Get Transformer Function from file
+      // Get Transformer Function with Data from file
-      cy.readFile("cypress/support/queryLevelTransformerFunction.js").then((transformerFunction) => {
+      cy.readFile("cypress/support/queryLevelTransformerFunctionWithData.js").then((transformerFunction) => {
+        //console.log(transformerFunction[1])
         cy.get(".CodeMirror textarea")
         // Highlight current text and overwrite with file contents
         .type(Cypress.platform === 'darwin' ? '{cmd}a' : '{ctrl}a', { force: true })
@@ -30,83 +59,58 @@ context("Query Level Transformers", () => {
       cy.get("@query").its('response.body.rows').should('not.be.empty')
     })
     
-  it("should add data to the previous query", () => {
+    it("should run an invalid query within the transformer section", () => {
-    // Add REST datasource - contains API for breweries
+      // Add REST datasource - contains API for breweries
-    const datasource = "REST"
+      const datasource = "REST"
-    const restUrl = "https://api.openbrewerydb.org/breweries"
+      const restUrl = "https://api.openbrewerydb.org/breweries"
-    cy.selectExternalDatasource(datasource)
+      cy.selectExternalDatasource(datasource)
-    cy.createRestQuery("GET", restUrl)
+      cy.createRestQuery("GET", restUrl)
-    cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
+      cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
-    // Get Transformer Function with Data from file
+      // Clear the code box and add "test"
-    cy.readFile("cypress/support/queryLevelTransformerFunctionWithData.js").then((transformerFunction) => {
-      //console.log(transformerFunction[1])
       cy.get(".CodeMirror textarea")
-      // Highlight current text and overwrite with file contents
       .type(Cypress.platform === 'darwin' ? '{cmd}a' : '{ctrl}a', { force: true })
-      .type(transformerFunction, { parseSpecialCharSequences: false })
+      .type("test")
+      // Run Query and intercept
+      cy.intercept('**/preview').as('queryError')
+      cy.get(".spectrum-Button").contains("Send").click({ force: true })
+      cy.wait("@queryError")
+      cy.wait(500)
+      // Assert against message and status for the query error
+      cy.get("@queryError").its('response.body').should('have.property', 'message', "test is not defined")
+      cy.get("@queryError").its('response.body').should('have.property', 'status', 400)
     })
-    // Send Query
-    cy.intercept('**/queries/preview').as('query')
-    cy.get(".spectrum-Button").contains("Send").click({ force: true })
-    cy.wait("@query")
-    // Assert against Status Code, body, & body rows
-    cy.get("@query").its('response.statusCode')
-    .should('eq', 200)
-    cy.get("@query").its('response.body').should('not.be.empty')
-    cy.get("@query").its('response.body.rows').should('not.be.empty')
-  })
     
-  it("should run an invalid query within the transformer section", () => {
+    it("should run an invalid query via POST request", () => {
-    // Add REST datasource - contains API for breweries
+      // POST request with transformer as null
-    const datasource = "REST"
+      cy.request({method: 'POST',
-    const restUrl = "https://api.openbrewerydb.org/breweries"
+      url: `${Cypress.config().baseUrl}/api/queries/`,
-    cy.selectExternalDatasource(datasource)
+      body: {fields : {"headers":{},"queryString":null,"path":null},
-    cy.createRestQuery("GET", restUrl)
+      parameters : [],
-    cy.get(".spectrum-Tabs-itemLabel").contains("Transformer").click()
+      schema : {},
-    // Clear the code box and add "test"
+      name : "test",
-    cy.get(".CodeMirror textarea")
+      queryVerb : "read",
-    .type(Cypress.platform === 'darwin' ? '{cmd}a' : '{ctrl}a', { force: true })
+      transformer : null,
-    .type("test")
+      datasourceId: "test"},
-    // Run Query and intercept
+      // Expected 400 error - Transformer must be a string
-    cy.intercept('**/preview').as('queryError')
+      failOnStatusCode: false}).then((response) => {
-    cy.get(".spectrum-Button").contains("Send").click({ force: true })
+        expect(response.status).to.equal(400)
-    cy.wait("@queryError")
+        expect(response.body.message).to.include('Invalid body - "transformer" must be a string')
-    cy.wait(500)
+      })
-    // Assert against message and status for the query error
-    cy.get("@queryError").its('response.body').should('have.property', 'message', "test is not defined")
-    cy.get("@queryError").its('response.body').should('have.property', 'status', 400)
-  })
-  
-  it("should run an invalid query via POST request", () => {
-    // POST request with transformer as null
-    cy.request({method: 'POST',
-    url: `${Cypress.config().baseUrl}/api/queries/`,
-    body: {fields : {"headers":{},"queryString":null,"path":null},
-    parameters : [],
-    schema : {},
-    name : "test",
-    queryVerb : "read",
-    transformer : null,
-    datasourceId: "test"},
-    // Expected 400 error - Transformer must be a string
-    failOnStatusCode: false}).then((response) => {
-      expect(response.status).to.equal(400)
-      expect(response.body.message).to.include('Invalid body - "transformer" must be a string')
     })
-  })
     
-  it("should run an empty query", () => {
+    it("should run an empty query", () => {
-    // POST request with Transformer as an empty string
+      // POST request with Transformer as an empty string
-    cy.request({method: 'POST',
+      cy.request({method: 'POST',
-    url: `${Cypress.config().baseUrl}/api/queries/preview`,
+      url: `${Cypress.config().baseUrl}/api/queries/preview`,
-    body: {fields : {"headers":{},"queryString":null,"path":null},
+      body: {fields : {"headers":{},"queryString":null,"path":null},
-    queryVerb : "read",
+      queryVerb : "read",
-    transformer : "",
+      transformer : "",
-    datasourceId: "test"},
+      datasourceId: "test"},
-    // Expected 400 error - Transformer is not allowed to be empty
+      // Expected 400 error - Transformer is not allowed to be empty
-    failOnStatusCode: false}).then((response) => {
+      failOnStatusCode: false}).then((response) => {
-      expect(response.status).to.equal(400)
+        expect(response.status).to.equal(400)
-      expect(response.body.message).to.include('Invalid body - "transformer" is not allowed to be empty')
+        expect(response.body.message).to.include('Invalid body - "transformer" is not allowed to be empty')
+      })
     })
   })
 })

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

@@ -1,127 +1,131 @@
-context("Rename an App", () => {
+import filterTests from "../support/filterTests"
-    beforeEach(() => {
-      cy.login()
-      cy.createTestApp()
-    })
 
-it("should rename an unpublished application", () => {
+filterTests(['all'], () => {
-    const appName = "Cypress Tests"
+    context("Rename an App", () => {
-    const appRename = "Cypress Renamed"
+        beforeEach(() => {
-    // Rename app, Search for app, Confirm name was changed
+        cy.login()
-    cy.get(".home-logo").click()
+        cy.createTestApp()
-    renameApp(appName, appRename)
-    cy.reload()
-    cy.wait(1000)
-    cy.searchForApplication(appRename)
-    cy.get(".appTable").find(".title").should("have.length", 1)
-    // Set app name back to Cypress Tests
-    cy.reload()
-    cy.wait(1000)
-    renameApp(appRename, appName)
-})
-    
-xit("Should rename a published application", () => {
-    // It is not possible to rename a published application
-    const appName = "Cypress Tests"
-    const appRename = "Cypress Renamed"
-    // Publish the app
-    cy.get(".toprightnav")
-    cy.get(".spectrum-Button").contains("Publish").click({force: true})
-    cy.get(".spectrum-Dialog-grid")
-        .within(() => {
-            // Click publish again within the modal
-            cy.get(".spectrum-Button").contains("Publish").click({force: true})
         })
-    // Rename app, Search for app, Confirm name was changed
-    cy.get(".home-logo").click()
-    renameApp(appName, appRename, true)
-    cy.searchForApplication(appRename)
-    cy.get(".appTable").find(".wrapper").should("have.length", 1)
-})
 
-it("Should try to rename an application to have no name", () => {
+    it("should rename an unpublished application", () => {
-    const appName = "Cypress Tests"
+        const appName = "Cypress Tests"
-    cy.get(".home-logo").click()
+        const appRename = "Cypress Renamed"
-    renameApp(appName, " ", false, true)
+        // Rename app, Search for app, Confirm name was changed
-    cy.wait(500)
+        cy.get(".home-logo").click()
-    // Close modal and confirm name has not been changed
+        renameApp(appName, appRename)
-    cy.get(".spectrum-Dialog-grid").contains("Cancel").click()
+        cy.reload()
-    cy.reload() 
+        cy.wait(1000)
-    cy.wait(1000)
+        cy.searchForApplication(appRename)
-    cy.searchForApplication(appName)
+        cy.get(".appTable").find(".title").should("have.length", 1)
-    cy.get(".appTable").find(".title").should("have.length", 1)
+        // Set app name back to Cypress Tests
-})
+        cy.reload()
-
+        cy.wait(1000)
-xit("Should create two applications with the same name", () => {
+        renameApp(appRename, appName)
-    // It is not possible to have applications with the same name
-    const appName = "Cypress Tests"
-    cy.visit(`${Cypress.config().baseUrl}/builder`)
-    cy.wait(500)
-    cy.get(".spectrum-Button").contains("Create app").click({force: true})
-    cy.contains(/Start from scratch/).click()
-    cy.get(".spectrum-Modal")
-    .within(() => {
-      cy.get("input").eq(0).type(appName)
-      cy.get(".spectrum-ButtonGroup").contains("Create app").click({force: true})
-      cy.get(".error").should("have.text", "Another app with the same name already exists")      
     })
-})
         
-it("should validate application names", () => {
+    xit("Should rename a published application", () => {
-    // App name must be letters, numbers and spaces only
+        // It is not possible to rename a published application
-    // This test checks numbers and special characters specifically
+        const appName = "Cypress Tests"
-    const appName = "Cypress Tests"
+        const appRename = "Cypress Renamed"
-    const numberName = 12345
+        // Publish the app
-    const specialCharName = "£$%^"
+        cy.get(".toprightnav")
-    cy.get(".home-logo").click()
+        cy.get(".spectrum-Button").contains("Publish").click({force: true})
-    renameApp(appName, numberName)
+        cy.get(".spectrum-Dialog-grid")
-    cy.reload()
+            .within(() => {
-    cy.wait(1000)
+                // Click publish again within the modal
-    cy.searchForApplication(numberName)
+                cy.get(".spectrum-Button").contains("Publish").click({force: true})
-    cy.get(".appTable").find(".title").should("have.length", 1)
+            })
-    cy.reload()
+        // Rename app, Search for app, Confirm name was changed
-    cy.wait(1000)
+        cy.get(".home-logo").click()
-    renameApp(numberName, specialCharName)
+        renameApp(appName, appRename, true)
-    cy.get(".error").should("have.text", "App name must be letters, numbers and spaces only")
+        cy.searchForApplication(appRename)
-    // Set app name back to Cypress Tests
+        cy.get(".appTable").find(".wrapper").should("have.length", 1)
-    cy.reload()
+    })
-    cy.wait(1000)
-    renameApp(numberName, appName)
-})
 
-    const renameApp = (originalName, changedName, published, noName) => {
+    it("Should try to rename an application to have no name", () => {
-        cy.searchForApplication(originalName)
+        const appName = "Cypress Tests"
-        cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+        cy.get(".home-logo").click()
-    .its("body")
+        renameApp(appName, " ", false, true)
-    .then(val => {
+        cy.wait(500)
-        if (val.length > 0) {
+        // Close modal and confirm name has not been changed
-            cy.get(".appTable")
+        cy.get(".spectrum-Dialog-grid").contains("Cancel").click()
-            .within(() => {
+        cy.reload() 
-                cy.get(".spectrum-Icon").eq(1).click()
+        cy.wait(1000)
-                })
+        cy.searchForApplication(appName)
-            // Check for when an app is published
+        cy.get(".appTable").find(".title").should("have.length", 1)
-            if (published == true){
+    })
-                // Should not have Edit as option, will unpublish app
+
-                cy.should("not.have.value", "Edit")
+    xit("Should create two applications with the same name", () => {
-                cy.get(".spectrum-Menu").contains("Unpublish").click()
+        // It is not possible to have applications with the same name
-                cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+        const appName = "Cypress Tests"
-                cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
+        cy.visit(`${Cypress.config().baseUrl}/builder`)
-            }
+        cy.wait(500)
-            cy.contains("Edit").click()
+        cy.get(".spectrum-Button").contains("Create app").click({force: true})
-            cy.get(".spectrum-Modal")
+        cy.contains(/Start from scratch/).click()
-            .within(() => {
+        cy.get(".spectrum-Modal")
-                if (noName == true){
+        .within(() => {
-                    cy.get("input").clear()
+        cy.get("input").eq(0).type(appName)
-                    cy.get(".spectrum-Dialog-grid").click()
+        cy.get(".spectrum-ButtonGroup").contains("Create app").click({force: true})
-                    .contains("App name must be letters, numbers and spaces only")
+        cy.get(".error").should("have.text", "Another app with the same name already exists")      
-                    return cy
+        })
+    })
+
+    it("should validate application names", () => {
+        // App name must be letters, numbers and spaces only
+        // This test checks numbers and special characters specifically
+        const appName = "Cypress Tests"
+        const numberName = 12345
+        const specialCharName = "£$%^"
+        cy.get(".home-logo").click()
+        renameApp(appName, numberName)
+        cy.reload()
+        cy.wait(1000)
+        cy.searchForApplication(numberName)
+        cy.get(".appTable").find(".title").should("have.length", 1)
+        cy.reload()
+        cy.wait(1000)
+        renameApp(numberName, specialCharName)
+        cy.get(".error").should("have.text", "App name must be letters, numbers and spaces only")
+        // Set app name back to Cypress Tests
+        cy.reload()
+        cy.wait(1000)
+        renameApp(numberName, appName)
+    })
+        
+        const renameApp = (originalName, changedName, published, noName) => {
+            cy.searchForApplication(originalName)
+            cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+        .its("body")
+        .then(val => {
+            if (val.length > 0) {
+                cy.get(".appTable")
+                .within(() => {
+                    cy.get(".spectrum-Icon").eq(1).click()
+                    })
+                // Check for when an app is published
+                if (published == true){
+                    // Should not have Edit as option, will unpublish app
+                    cy.should("not.have.value", "Edit")
+                    cy.get(".spectrum-Menu").contains("Unpublish").click()
+                    cy.get(".spectrum-Dialog-grid").contains("Unpublish app").click()
+                    cy.get(".appTable > :nth-child(5) > :nth-child(2) > .spectrum-Icon").click()
                 }
-                cy.get("input").clear()
+                cy.contains("Edit").click()
-                cy.get("input").eq(0).type(changedName).should("have.value", changedName).blur()
+                cy.get(".spectrum-Modal")
-                cy.get(".spectrum-ButtonGroup").contains("Save").click({force: true})
+                .within(() => {
-                cy.wait(500)
+                    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)
+        })
+        }
+        })
     }
     })
-}
 })

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

@@ -1,62 +1,66 @@
-context("Revert apps", () => {
+import filterTests from "../support/filterTests"
-    before(() => {
-    cy.login()
-    cy.createTestApp()
-    })
 
-    it("should try to revert an unpublished app", () => {
+filterTests(['smoke', 'all'], () => {
-        // Click revert icon
+    context("Revert apps", () => {
-        cy.get(".toprightnav").within(() => {
+        before(() => {
-            cy.get(".spectrum-Icon").eq(1).click()
+        cy.login()
+        cy.createTestApp()
         })
-        cy.get(".spectrum-Dialog-grid").within(() => {
-            // Enter app name before revert
-            cy.get("input").type("Cypress Tests")
-            cy.intercept('**/revert').as('revertApp')
-            // Click Revert
-            cy.get(".spectrum-Button").contains("Revert").click({ force: true })
-            // Intercept Request after button click & apply assertions
-            cy.wait("@revertApp")
-            cy.get("@revertApp").its('response.body').should('have.property', 'message', "App has not yet been deployed")
-            cy.get("@revertApp").its('response.body').should('have.property', 'status', 400)
-        })
-    })
         
-    it("should revert a published app", () => {
+        it("should try to revert an unpublished app", () => {
-        // Add initial component - Paragraph
+            // Click revert icon
-        cy.addComponent("Elements", "Paragraph")
+            cy.get(".toprightnav").within(() => {
-        // Publish app
+                cy.get(".spectrum-Icon").eq(1).click()
-        cy.get(".spectrum-Button").contains("Publish").click({ force: true })
+            })
-        cy.get(".spectrum-ButtonGroup").within(() => {
+            cy.get(".spectrum-Dialog-grid").within(() => {
+                // Enter app name before revert
+                cy.get("input").type("Cypress Tests")
+                cy.intercept('**/revert').as('revertApp')
+                // Click Revert
+                cy.get(".spectrum-Button").contains("Revert").click({ force: true })
+                // Intercept Request after button click & apply assertions
+                cy.wait("@revertApp")
+                cy.get("@revertApp").its('response.body').should('have.property', 'message', "App has not yet been deployed")
+                cy.get("@revertApp").its('response.body').should('have.property', 'status', 400)
+            })
+        })
+        
+        it("should revert a published app", () => {
+            // Add initial component - Paragraph
+            cy.addComponent("Elements", "Paragraph")
+            // Publish app
             cy.get(".spectrum-Button").contains("Publish").click({ force: true })
-        })
+            cy.get(".spectrum-ButtonGroup").within(() => {
-        // Add second component - Button
+                cy.get(".spectrum-Button").contains("Publish").click({ force: true })
-        cy.addComponent("Elements", "Button")
+            })
-        // Click Revert
+            // Add second component - Button
-        cy.get(".toprightnav").within(() => {
+            cy.addComponent("Elements", "Button")
-            cy.get(".spectrum-Icon").eq(1).click()
-        })
-        cy.get(".spectrum-Dialog-grid").within(() => {
             // Click Revert
-            cy.get(".spectrum-Button").contains("Revert").click({ force: true })
+            cy.get(".toprightnav").within(() => {
-            cy.wait(1000)
+                cy.get(".spectrum-Icon").eq(1).click()
+            })
+            cy.get(".spectrum-Dialog-grid").within(() => {
+                // Click Revert
+                cy.get(".spectrum-Button").contains("Revert").click({ force: true })
+                cy.wait(1000)
+            })
+            // Confirm Paragraph component is still visible
+            cy.get(".root").contains("New Paragraph")
+            // Confirm Button component is not visible
+            cy.get(".root").should("not.have.text", "New Button")
         })
-        // Confirm Paragraph component is still visible
-        cy.get(".root").contains("New Paragraph")
-        // Confirm Button component is not visible
-        cy.get(".root").should("not.have.text", "New Button")
-    })
         
-    it("should enter incorrect app name when reverting", () => {
+        it("should enter incorrect app name when reverting", () => {
-        // Click Revert
+            // Click Revert
-        cy.get(".toprightnav").within(() => {
+            cy.get(".toprightnav").within(() => {
-            cy.get(".spectrum-Icon").eq(1).click()
+                cy.get(".spectrum-Icon").eq(1).click()
-        })
+            })
-        // Enter incorrect app name
+            // Enter incorrect app name
-        cy.get(".spectrum-Dialog-grid").within(() => {
+            cy.get(".spectrum-Dialog-grid").within(() => {
-            cy.get("input").type("Cypress Tests")
+                cy.get("input").type("Cypress Tests")
-            // Revert button within modal should be disabled
+                // Revert button within modal should be disabled
-            cy.get(".spectrum-Button").eq(1).should('be.disabled')
+                cy.get(".spectrum-Button").eq(1).should('be.disabled')
+            })
         })
     })
 })

packages/builder/cypress/support/filterTests.js

@@ -0,0 +1,16 @@
+const filterTests = (testTags, runTest) => {
+    // testTags is an array of tags
+    // runTest is all tests
+    if (Cypress.env('TEST_TAGS')) {
+      const tags = Cypress.env('TEST_TAGS').split('/');
+      const found = testTags.some(($testTags) => tags.includes($testTags));
+  
+      if (found) {
+        runTest();
+      }
+    } else {
+      runTest();
+    }
+  };
+  
+  export default filterTests;