Fixing some issues with cypress tests and screens getting multipled.

5 years ago · 552c608b49
3 changed files with 8 additions and 6 deletions
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@ -37,7 +37,7 @@ Cypress.Commands.add("createApp", name => {
      cy.contains("Create app").click()
    })
    .then(() => {
-      cy.contains("Budibase DB", {
+      cy.get(".selected > .content", {
        timeout: 20000,
      }).should("be.visible")
    })
@ -51,7 +51,7 @@ Cypress.Commands.add("deleteApp", () => {
    .then(val => {
      console.log(val)
      if (val.length > 0) {
-        cy.get(".hoverable > use").click()
+        cy.get(".title > :nth-child(3) > .spectrum-Icon").click()
        cy.contains("Delete").click()
        cy.get(".spectrum-Button--warning").click()
      }
@ -72,7 +72,7 @@ Cypress.Commands.add("createTestTableWithData", () => {

 Cypress.Commands.add("createTable", tableName => {
  // Enter table name
-  cy.get("Budibase DB")
+  cy.contains("Budibase DB").click()
  cy.contains("Create new table").click()
  cy.get(".spectrum-Modal").within(() => {
    cy.get("input").first().type(tableName).blur()
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@ -91,7 +91,7 @@
    }

    // Navigate to new table
-    $goto(`./table/${table._id}`)
+    $goto(`../../table/${table._id}`)
  }
 </script>

--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
@ -2,7 +2,7 @@
  import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
  import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
  import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { tables, datasources } from "stores/backend"
+  import { tables } from "stores/backend"
  import { goto } from "@roxi/routify"

  let modal
@ -29,7 +29,9 @@
      {#each $tables.list.filter(table => table.type !== "external") as table}
        <div class="table-list-item" on:click={$goto(`../../table/${table._id}`)}>
          <Body size="S">{table.name}</Body>
-          <Body size="S">display column: {table.primaryDisplay}</Body>
+          {#if table.primaryDisplay}
+            <Body size="S">display column: {table.primaryDisplay}</Body>
+          {/if}
        </div>
      {/each}
    </div>