Update screen tests

packages/server/src/api/routes/tests/screen.spec.ts

@@ -9,6 +9,7 @@ import {
   UsageInScreensResponse,
 } from "@budibase/types"
 import { basicDatasourcePlus } from "../../../tests/utilities/structures"
+import { SAMPLE_DATA_SCREEN_NAME } from "../../../constants/screens"
 
 const {
   basicScreen,
@@ -22,17 +23,22 @@ const {
 
 describe("/screens", () => {
   let config = setup.getConfig()
-  let screen: Screen
 
   afterAll(setup.afterAll)
 
   beforeAll(async () => {
     await config.init()
-    screen = await config.createScreen()
   })
 
   describe("fetch", () => {
-    it("should be able to create a layout", async () => {
+    it("should create the sample data screen", async () => {
+      const screens = await config.api.screen.list()
+      expect(screens.length).toEqual(1)
+      expect(screens[0].name).toEqual(SAMPLE_DATA_SCREEN_NAME)
+    })
+
+    it("should be able to create a screen", async () => {
+      const screen = await config.createScreen()
       const screens = await config.api.screen.list()
       expect(screens.length).toEqual(1)
       expect(screens.some(s => s._id === screen._id)).toEqual(true)
@@ -92,8 +98,14 @@ describe("/screens", () => {
         const res = await config.api.application.getDefinition(
           config.getProdAppId()
         )
-        expect(res.screens.length).toEqual(screenIds.length)
-        expect(res.screens.map(s => s._id).sort()).toEqual(screenIds.sort())
+
+        // Filter out sample screen
+        const screens = res.screens.filter(
+          s => s.name !== SAMPLE_DATA_SCREEN_NAME
+        )
+
+        expect(screens.length).toEqual(screenIds.length)
+        expect(screens.map(s => s._id).sort()).toEqual(screenIds.sort())
       })
     }
 

packages/server/src/constants/screens.ts

@@ -2,6 +2,8 @@ import { roles } from "@budibase/backend-core"
 import { BASE_LAYOUT_PROP_IDS } from "./layouts"
 import { Screen, Table, Query, ViewV2, Component } from "@budibase/types"
 
+export const SAMPLE_DATA_SCREEN_NAME = "sample-data-inventory-screen"
+
 export function createHomeScreen(
   config: {
     roleId: string
@@ -233,7 +235,7 @@ export function createSampleDataTableScreen(): Screen {
     showNavigation: true,
     width: "Large",
     routing: { route: "/inventory", roleId: "BASIC", homeScreen: false },
-    name: "sample-data-inventory-screen",
+    name: SAMPLE_DATA_SCREEN_NAME,
     props: {
       _id: "c38f2b9f250fb4c33965ce47e12c02a80",
       _component: "@budibase/standard-components/container",