Small changes based on PR feedback

As per some of the comments on the PR:
- Renaming createScreen & deleteScreen to create & delete as they are on the screens namespace
- Updating a test within create.spec.js (applications) for when a screen is generated
- Improvements to the current screens tests (removing unnecessary `expect` lines & updating the for loop for the create screens test)
This commit is contained in:
Mitch-Budibase 2022-10-12 17:48:33 +01:00
parent 3c25763bd9
commit 9eb0714033
3 changed files with 9 additions and 18 deletions

View File

@ -9,13 +9,13 @@ import InternalAPIClient from "./InternalAPIClient"
this.api = apiClient this.api = apiClient
} }
async createScreen(body: any): Promise<[Response, Screen]> { async create(body: any): Promise<[Response, Screen]> {
const response = await this.api.post(`/screens`, { body }) const response = await this.api.post(`/screens`, { body })
const json = await response.json() const json = await response.json()
return [response, json] return [response, json]
} }
async deleteScreen(screenId: any, rev: any): Promise<[Response, Screen]> { async delete(screenId: string, rev: string): Promise<[Response, Screen]> {
const response = await this.api.del(`/screens/${screenId}/${rev}`) const response = await this.api.del(`/screens/${screenId}/${rev}`)
const json = await response.json() const json = await response.json()
return [response, json] return [response, json]

View File

@ -164,7 +164,7 @@ describe("Internal API - /applications endpoints", () => {
// Change/add component to the app // Change/add component to the app
const [screenResponse, screen] = await config.applications.addScreentoApp( const [screenResponse, screen] = await config.applications.addScreentoApp(
generateScreen() generateScreen("BASIC")
) )
expect(screenResponse).toHaveStatusCode(200) expect(screenResponse).toHaveStatusCode(200)
expect(screen._id).toBeDefined() expect(screen._id).toBeDefined()

View File

@ -22,29 +22,24 @@ describe("Internal API - /screens endpoints", () => {
it("POST - Create a screen with each role type", async () => { it("POST - Create a screen with each role type", async () => {
// Create app // Create app
const [appResponse, app] = await appConfig.applications.create(generateApp()) const [appResponse, app] = await appConfig.applications.create(generateApp())
expect(appResponse).toHaveStatusCode(200)
expect(app._id).toBeDefined()
// Create Screen // Create Screen
const roleArray = ["BASIC", "POWER", "ADMIN", "PUBLIC"] const roleArray = ["BASIC", "POWER", "ADMIN", "PUBLIC"]
appConfig.applications.api.appId = app.appId appConfig.applications.api.appId = app.appId
for (let i = 0; i < 4; i++) { for (let role in roleArray) {
const [response, screen] = await config.screen.createScreen(generateScreen(roleArray[i])) const [response, screen] = await config.screen.create(generateScreen(roleArray[role]))
expect(response).toHaveStatusCode(200) expect(response).toHaveStatusCode(200)
expect(screen.routing.roleId).toEqual(roleArray[i]) expect(screen.routing.roleId).toEqual(roleArray[role])
} }
}) })
it("GET - Fetch screens", async () => { it("GET - Fetch screens", async () => {
// Create app // Create app
const [appResponse, app] = await appConfig.applications.create(generateApp()) const [appResponse, app] = await appConfig.applications.create(generateApp())
expect(appResponse).toHaveStatusCode(200)
expect(app._id).toBeDefined()
// Create Screen // Create Screen
appConfig.applications.api.appId = app.appId appConfig.applications.api.appId = app.appId
const [response, screen] = await config.screen.createScreen(generateScreen("BASIC")) const [response, screen] = await config.screen.create(generateScreen("BASIC"))
expect(response).toHaveStatusCode(200)
// Check screen exists // Check screen exists
const [routesResponse, routes] = await appConfig.applications.getRoutes() const [routesResponse, routes] = await appConfig.applications.getRoutes()
@ -55,17 +50,13 @@ describe("Internal API - /screens endpoints", () => {
it("DELETE - Delete a screen", async () => { it("DELETE - Delete a screen", async () => {
// Create app // Create app
const [appResponse, app] = await appConfig.applications.create(generateApp()) const [appResponse, app] = await appConfig.applications.create(generateApp())
expect(appResponse).toHaveStatusCode(200)
expect(app._id).toBeDefined()
// Create Screen // Create Screen
appConfig.applications.api.appId = app.appId appConfig.applications.api.appId = app.appId
const [screenResponse, screen] = await config.screen.createScreen(generateScreen("BASIC")) const [screenResponse, screen] = await config.screen.create(generateScreen("BASIC"))
expect(screenResponse).toHaveStatusCode(200)
expect(screen._id).toBeDefined()
// Delete Screen // Delete Screen
const [response] = await config.screen.deleteScreen(screen._id, screen._rev) const [response] = await config.screen.delete(screen._id!, screen._rev!)
expect(response).toHaveStatusCode(200) expect(response).toHaveStatusCode(200)
}) })
}) })