Oracle & Table pagination Test Env Only

createTable
-Pagination is now Test Env only

oracle
-Test Env only
-Removed smoke test tag

commands
-Fix for createApp command
-Increase wait for createRestQuery command

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

@@ -50,6 +50,8 @@ filterTests(['smoke', 'all'], () => {
       cy.contains("RoverUpdated").should("not.exist")
     })
     
+    if (Cypress.env("TEST_ENV")) {
+      // No Pagination in CI - Test env only for the next two tests
       it("Adds 15 rows and checks pagination", () => {
         // 10 rows per page, 15 rows should create 2 pages within table
         const totalRows = 16
@@ -79,6 +81,7 @@ filterTests(['smoke', 'all'], () => {
           cy.get(".spectrum-ActionButton").eq(1).should('not.be.enabled')
         })
       })
+    }
 
     it("deletes a column", () => {
       const columnName = "nameupdated"

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

@@ -1,7 +1,9 @@
 import filterTests from "../../support/filterTests"
 
-filterTests(['all', 'smoke'], () => {
+filterTests(['all'], () => {
     context("Oracle Datasource Testing", () => {
+        if (Cypress.env("TEST_ENV")) {
+
             before(() => {
             cy.login()
             cy.createTestApp()
@@ -37,8 +39,6 @@ filterTests(['all', 'smoke'], () => {
                 // 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)
             })
             
@@ -191,5 +191,6 @@ filterTests(['all', 'smoke'], () => {
                 // Confirm deletion
                 cy.get(".nav-item").should('not.contain', queryName)
             })
+        }
     })
 })

packages/builder/cypress/support/commands.js

@@ -35,14 +35,7 @@ Cypress.Commands.add("login", () => {
 Cypress.Commands.add("createApp", name => {
   cy.visit(`${Cypress.config().baseUrl}/builder`)
   cy.wait(500)
-  cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
-    .its("body")
-    .then(body => {
-      if (body.length > 0) {
   cy.get(".spectrum-Button").contains("Create app").click({ force: true })
-      }
-    })
-  cy.contains(/Start from scratch/).dblclick()
   cy.get(".spectrum-Modal").within(() => {
     cy.get("input").eq(0).type(name).should("have.value", name).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create app").click()
@@ -445,7 +438,7 @@ Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => {
 Cypress.Commands.add("createRestQuery", (method, restUrl) => {
   // addExternalDatasource should be called prior to this
   // Configures REST datasource & sends query
-  cy.wait(500)
+  cy.wait(1000)
   cy.get(".spectrum-Button").contains("Add query").click({ force: true })
   // Select Method & add Rest URL
   cy.get(".spectrum-Picker-label").eq(1).click()