From a2d44968e559db56c93172b7468a37132a500a26 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Thu, 17 Jun 2021 19:31:52 +0200 Subject: [PATCH] Format --- ui/src/inject.tsx | 16 ++++---- ui/src/tests/application.test.ts | 69 ++++++++++++++++---------------- ui/src/tests/client.test.ts | 46 ++++++++++++--------- ui/src/tests/message.test.ts | 6 +-- ui/src/tests/user.test.ts | 42 +++++++++---------- 5 files changed, 91 insertions(+), 88 deletions(-) diff --git a/ui/src/inject.tsx b/ui/src/inject.tsx index aa51db7..49599ba 100644 --- a/ui/src/inject.tsx +++ b/ui/src/inject.tsx @@ -23,13 +23,15 @@ export interface StoreMapping { export type AllStores = Extract; export type Stores = Pick; -// eslint-disable-next-line @typescript-eslint/ban-types -export const inject = (...stores: I[]) =>

( - node: React.ComponentType

-): React.ComponentType>> => - // eslint-disable-next-line @typescript-eslint/no-explicit-any - mobxInject(...stores)(node) as any; +export const inject = + (...stores: I[]) => + // eslint-disable-next-line @typescript-eslint/ban-types +

( + node: React.ComponentType

+ ): React.ComponentType>> => + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mobxInject(...stores)(node) as any; -export const InjectProvider: React.SFC<{stores: StoreMapping}> = ({children, stores}) => ( +export const InjectProvider: React.FC<{stores: StoreMapping}> = ({children, stores}) => ( {children} ); diff --git a/ui/src/tests/application.test.ts b/ui/src/tests/application.test.ts index ac6de3f..f64a798 100644 --- a/ui/src/tests/application.test.ts +++ b/ui/src/tests/application.test.ts @@ -26,43 +26,42 @@ const hiddenToken = '•••••••••••••••'; const $table = selector.table('#app-table'); const $dialog = selector.form('#app-dialog'); -const hasApp = ( - name: string, - description: string, - row: number -): (() => Promise) => async () => { - expect(await innerText(page, $table.cell(row, Col.Name))).toBe(name); - expect(await innerText(page, $table.cell(row, Col.Token))).toBe(hiddenToken); - expect(await innerText(page, $table.cell(row, Col.Description))).toBe(description); -}; +const hasApp = + (name: string, description: string, row: number): (() => Promise) => + async () => { + expect(await innerText(page, $table.cell(row, Col.Name))).toBe(name); + expect(await innerText(page, $table.cell(row, Col.Token))).toBe(hiddenToken); + expect(await innerText(page, $table.cell(row, Col.Description))).toBe(description); + }; -const updateApp = ( - id: number, - data: {name?: string; description?: string} -): (() => Promise) => async () => { - await page.click($table.cell(id, Col.EditUpdate, '.edit')); - await page.waitForSelector($dialog.selector()); - if (data.name) { - const nameSelector = $dialog.input('.name'); - await clearField(page, nameSelector); - await page.type(nameSelector, data.name); - } - if (data.description) { - const descSelector = $dialog.textarea('.description'); - await clearField(page, descSelector); - await page.type(descSelector, data.description); - } - await page.click($dialog.button('.update')); - await waitToDisappear(page, $dialog.selector()); -}; +const updateApp = + (id: number, data: {name?: string; description?: string}): (() => Promise) => + async () => { + await page.click($table.cell(id, Col.EditUpdate, '.edit')); + await page.waitForSelector($dialog.selector()); + if (data.name) { + const nameSelector = $dialog.input('.name'); + await clearField(page, nameSelector); + await page.type(nameSelector, data.name); + } + if (data.description) { + const descSelector = $dialog.textarea('.description'); + await clearField(page, descSelector); + await page.type(descSelector, data.description); + } + await page.click($dialog.button('.update')); + await waitToDisappear(page, $dialog.selector()); + }; -const createApp = (name: string, description: string): (() => Promise) => async () => { - await page.click('#create-app'); - await page.waitForSelector($dialog.selector()); - await page.type($dialog.input('.name'), name); - await page.type($dialog.textarea('.description'), description); - await page.click($dialog.button('.create')); -}; +const createApp = + (name: string, description: string): (() => Promise) => + async () => { + await page.click('#create-app'); + await page.waitForSelector($dialog.selector()); + await page.type($dialog.input('.name'), name); + await page.type($dialog.textarea('.description'), description); + await page.click($dialog.button('.create')); + }; describe('Application', () => { it('does login', async () => await auth.login(page)); diff --git a/ui/src/tests/client.test.ts b/ui/src/tests/client.test.ts index d66e02c..6fb8285 100644 --- a/ui/src/tests/client.test.ts +++ b/ui/src/tests/client.test.ts @@ -21,21 +21,25 @@ enum Col { Delete = 4, } -const hasClient = (name: string, row: number): (() => Promise) => async () => { - expect(await innerText(page, $table.cell(row, Col.Name))).toBe(name); -}; +const hasClient = + (name: string, row: number): (() => Promise) => + async () => { + expect(await innerText(page, $table.cell(row, Col.Name))).toBe(name); + }; -const updateClient = (id: number, data: {name?: string}): (() => Promise) => async () => { - await page.click($table.cell(id, Col.Edit, '.edit')); - await page.waitForSelector($dialog.selector()); - if (data.name) { - const nameSelector = $dialog.input('.name'); - await clearField(page, nameSelector); - await page.type(nameSelector, data.name); - } - await page.click($dialog.button('.update')); - await waitToDisappear(page, $dialog.selector()); -}; +const updateClient = + (id: number, data: {name?: string}): (() => Promise) => + async () => { + await page.click($table.cell(id, Col.Edit, '.edit')); + await page.waitForSelector($dialog.selector()); + if (data.name) { + const nameSelector = $dialog.input('.name'); + await clearField(page, nameSelector); + await page.type(nameSelector, data.name); + } + await page.click($dialog.button('.update')); + await waitToDisappear(page, $dialog.selector()); + }; const $table = selector.table('#client-table'); const $dialog = selector.form('#client-dialog'); @@ -53,12 +57,14 @@ describe('Client', () => { expect(await count(page, $table.rows())).toBe(1); }); describe('create clients', () => { - const createClient = (name: string): (() => Promise) => async () => { - await page.click('#create-client'); - await page.waitForSelector($dialog.selector()); - await page.type($dialog.input('.name'), name); - await page.click($dialog.button('.create')); - }; + const createClient = + (name: string): (() => Promise) => + async () => { + await page.click('#create-client'); + await page.waitForSelector($dialog.selector()); + await page.type($dialog.input('.name'), name); + await page.click($dialog.button('.create')); + }; it('phone', createClient('phone')); it('desktop app', createClient('desktop app')); }); diff --git a/ui/src/tests/message.test.ts b/ui/src/tests/message.test.ts index eb47e5e..84609ac 100644 --- a/ui/src/tests/message.test.ts +++ b/ui/src/tests/message.test.ts @@ -205,9 +205,9 @@ describe('Messages', () => { it('deletes a windows message', async () => { await navigate('Windows'); await page.evaluate(() => - (document.querySelectorAll( - '#messages .message .delete' - )[1] as HTMLButtonElement).click() + ( + document.querySelectorAll('#messages .message .delete')[1] as HTMLButtonElement + ).click() ); await expectMessages({ all: [linux2, windows3, backup1, linux1, windows1], diff --git a/ui/src/tests/user.test.ts b/ui/src/tests/user.test.ts index fd91d92..c412e22 100644 --- a/ui/src/tests/user.test.ts +++ b/ui/src/tests/user.test.ts @@ -35,33 +35,29 @@ describe('User', () => { expect(await count(page, $table.rows())).toBe(1); }); describe('create users', () => { - const createUser = ( - name: string, - password: string, - isAdmin: boolean - ): (() => Promise) => async () => { - await page.click('#create-user'); - await page.waitForSelector($dialog.selector()); - await page.type($dialog.input('.name'), name); - await page.type($dialog.input('.password'), password); - if (isAdmin) { - await page.click($dialog.input('.admin-rights')); - } - await page.click($dialog.button('.save-create')); - await waitToDisappear(page, $dialog.selector()); - }; + const createUser = + (name: string, password: string, isAdmin: boolean): (() => Promise) => + async () => { + await page.click('#create-user'); + await page.waitForSelector($dialog.selector()); + await page.type($dialog.input('.name'), name); + await page.type($dialog.input('.password'), password); + if (isAdmin) { + await page.click($dialog.input('.admin-rights')); + } + await page.click($dialog.button('.save-create')); + await waitToDisappear(page, $dialog.selector()); + }; it('nicories', createUser('nicories', '123', false)); it('jmattheis', createUser('jmattheis', 'noice', true)); it('dude', createUser('dude', '1', false)); }); - const hasUser = ( - name: string, - isAdmin: boolean, - row: number - ): (() => Promise) => async () => { - expect(await innerText(page, $table.cell(row, Col.Name))).toBe(name); - expect(await innerText(page, $table.cell(row, Col.Admin))).toBe(isAdmin ? 'Yes' : 'No'); - }; + const hasUser = + (name: string, isAdmin: boolean, row: number): (() => Promise) => + async () => { + expect(await innerText(page, $table.cell(row, Col.Name))).toBe(name); + expect(await innerText(page, $table.cell(row, Col.Admin))).toBe(isAdmin ? 'Yes' : 'No'); + }; describe('has created users', () => { it('has four users', async () => {