From 9bb6e8e27c0aec991fdbeadf00141ada95b92625 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:33:06 +0700 Subject: [PATCH 1/2] chore: ui test script upload (grid view) --- .../tests-examples/demo-todo-app.spec.ts | 437 ------------------ Services/client/tests/example.spec.ts | 18 - Services/client/tests/file.txt | 1 + .../tests/upload-file-grid-view.spec.ts | 89 ++++ Services/server/.env.example | 32 +- 5 files changed, 111 insertions(+), 466 deletions(-) delete mode 100644 Services/client/tests-examples/demo-todo-app.spec.ts delete mode 100644 Services/client/tests/example.spec.ts create mode 100644 Services/client/tests/file.txt create mode 100644 Services/client/tests/upload-file-grid-view.spec.ts diff --git a/Services/client/tests-examples/demo-todo-app.spec.ts b/Services/client/tests-examples/demo-todo-app.spec.ts deleted file mode 100644 index 2fd6016..0000000 --- a/Services/client/tests-examples/demo-todo-app.spec.ts +++ /dev/null @@ -1,437 +0,0 @@ -import { test, expect, type Page } from '@playwright/test'; - -test.beforeEach(async ({ page }) => { - await page.goto('https://demo.playwright.dev/todomvc'); -}); - -const TODO_ITEMS = [ - 'buy some cheese', - 'feed the cat', - 'book a doctors appointment' -]; - -test.describe('New Todo', () => { - test('should allow me to add todo items', async ({ page }) => { - // create a new todo locator - const newTodo = page.getByPlaceholder('What needs to be done?'); - - // Create 1st todo. - await newTodo.fill(TODO_ITEMS[0]); - await newTodo.press('Enter'); - - // Make sure the list only has one todo item. - await expect(page.getByTestId('todo-title')).toHaveText([ - TODO_ITEMS[0] - ]); - - // Create 2nd todo. - await newTodo.fill(TODO_ITEMS[1]); - await newTodo.press('Enter'); - - // Make sure the list now has two todo items. - await expect(page.getByTestId('todo-title')).toHaveText([ - TODO_ITEMS[0], - TODO_ITEMS[1] - ]); - - await checkNumberOfTodosInLocalStorage(page, 2); - }); - - test('should clear text input field when an item is added', async ({ page }) => { - // create a new todo locator - const newTodo = page.getByPlaceholder('What needs to be done?'); - - // Create one todo item. - await newTodo.fill(TODO_ITEMS[0]); - await newTodo.press('Enter'); - - // Check that input is empty. - await expect(newTodo).toBeEmpty(); - await checkNumberOfTodosInLocalStorage(page, 1); - }); - - test('should append new items to the bottom of the list', async ({ page }) => { - // Create 3 items. - await createDefaultTodos(page); - - // create a todo count locator - const todoCount = page.getByTestId('todo-count') - - // Check test using different methods. - await expect(page.getByText('3 items left')).toBeVisible(); - await expect(todoCount).toHaveText('3 items left'); - await expect(todoCount).toContainText('3'); - await expect(todoCount).toHaveText(/3/); - - // Check all items in one call. - await expect(page.getByTestId('todo-title')).toHaveText(TODO_ITEMS); - await checkNumberOfTodosInLocalStorage(page, 3); - }); -}); - -test.describe('Mark all as completed', () => { - test.beforeEach(async ({ page }) => { - await createDefaultTodos(page); - await checkNumberOfTodosInLocalStorage(page, 3); - }); - - test.afterEach(async ({ page }) => { - await checkNumberOfTodosInLocalStorage(page, 3); - }); - - test('should allow me to mark all items as completed', async ({ page }) => { - // Complete all todos. - await page.getByLabel('Mark all as complete').check(); - - // Ensure all todos have 'completed' class. - await expect(page.getByTestId('todo-item')).toHaveClass(['completed', 'completed', 'completed']); - await checkNumberOfCompletedTodosInLocalStorage(page, 3); - }); - - test('should allow me to clear the complete state of all items', async ({ page }) => { - const toggleAll = page.getByLabel('Mark all as complete'); - // Check and then immediately uncheck. - await toggleAll.check(); - await toggleAll.uncheck(); - - // Should be no completed classes. - await expect(page.getByTestId('todo-item')).toHaveClass(['', '', '']); - }); - - test('complete all checkbox should update state when items are completed / cleared', async ({ page }) => { - const toggleAll = page.getByLabel('Mark all as complete'); - await toggleAll.check(); - await expect(toggleAll).toBeChecked(); - await checkNumberOfCompletedTodosInLocalStorage(page, 3); - - // Uncheck first todo. - const firstTodo = page.getByTestId('todo-item').nth(0); - await firstTodo.getByRole('checkbox').uncheck(); - - // Reuse toggleAll locator and make sure its not checked. - await expect(toggleAll).not.toBeChecked(); - - await firstTodo.getByRole('checkbox').check(); - await checkNumberOfCompletedTodosInLocalStorage(page, 3); - - // Assert the toggle all is checked again. - await expect(toggleAll).toBeChecked(); - }); -}); - -test.describe('Item', () => { - - test('should allow me to mark items as complete', async ({ page }) => { - // create a new todo locator - const newTodo = page.getByPlaceholder('What needs to be done?'); - - // Create two items. - for (const item of TODO_ITEMS.slice(0, 2)) { - await newTodo.fill(item); - await newTodo.press('Enter'); - } - - // Check first item. - const firstTodo = page.getByTestId('todo-item').nth(0); - await firstTodo.getByRole('checkbox').check(); - await expect(firstTodo).toHaveClass('completed'); - - // Check second item. - const secondTodo = page.getByTestId('todo-item').nth(1); - await expect(secondTodo).not.toHaveClass('completed'); - await secondTodo.getByRole('checkbox').check(); - - // Assert completed class. - await expect(firstTodo).toHaveClass('completed'); - await expect(secondTodo).toHaveClass('completed'); - }); - - test('should allow me to un-mark items as complete', async ({ page }) => { - // create a new todo locator - const newTodo = page.getByPlaceholder('What needs to be done?'); - - // Create two items. - for (const item of TODO_ITEMS.slice(0, 2)) { - await newTodo.fill(item); - await newTodo.press('Enter'); - } - - const firstTodo = page.getByTestId('todo-item').nth(0); - const secondTodo = page.getByTestId('todo-item').nth(1); - const firstTodoCheckbox = firstTodo.getByRole('checkbox'); - - await firstTodoCheckbox.check(); - await expect(firstTodo).toHaveClass('completed'); - await expect(secondTodo).not.toHaveClass('completed'); - await checkNumberOfCompletedTodosInLocalStorage(page, 1); - - await firstTodoCheckbox.uncheck(); - await expect(firstTodo).not.toHaveClass('completed'); - await expect(secondTodo).not.toHaveClass('completed'); - await checkNumberOfCompletedTodosInLocalStorage(page, 0); - }); - - test('should allow me to edit an item', async ({ page }) => { - await createDefaultTodos(page); - - const todoItems = page.getByTestId('todo-item'); - const secondTodo = todoItems.nth(1); - await secondTodo.dblclick(); - await expect(secondTodo.getByRole('textbox', { name: 'Edit' })).toHaveValue(TODO_ITEMS[1]); - await secondTodo.getByRole('textbox', { name: 'Edit' }).fill('buy some sausages'); - await secondTodo.getByRole('textbox', { name: 'Edit' }).press('Enter'); - - // Explicitly assert the new text value. - await expect(todoItems).toHaveText([ - TODO_ITEMS[0], - 'buy some sausages', - TODO_ITEMS[2] - ]); - await checkTodosInLocalStorage(page, 'buy some sausages'); - }); -}); - -test.describe('Editing', () => { - test.beforeEach(async ({ page }) => { - await createDefaultTodos(page); - await checkNumberOfTodosInLocalStorage(page, 3); - }); - - test('should hide other controls when editing', async ({ page }) => { - const todoItem = page.getByTestId('todo-item').nth(1); - await todoItem.dblclick(); - await expect(todoItem.getByRole('checkbox')).not.toBeVisible(); - await expect(todoItem.locator('label', { - hasText: TODO_ITEMS[1], - })).not.toBeVisible(); - await checkNumberOfTodosInLocalStorage(page, 3); - }); - - test('should save edits on blur', async ({ page }) => { - const todoItems = page.getByTestId('todo-item'); - await todoItems.nth(1).dblclick(); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages'); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).dispatchEvent('blur'); - - await expect(todoItems).toHaveText([ - TODO_ITEMS[0], - 'buy some sausages', - TODO_ITEMS[2], - ]); - await checkTodosInLocalStorage(page, 'buy some sausages'); - }); - - test('should trim entered text', async ({ page }) => { - const todoItems = page.getByTestId('todo-item'); - await todoItems.nth(1).dblclick(); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill(' buy some sausages '); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter'); - - await expect(todoItems).toHaveText([ - TODO_ITEMS[0], - 'buy some sausages', - TODO_ITEMS[2], - ]); - await checkTodosInLocalStorage(page, 'buy some sausages'); - }); - - test('should remove the item if an empty text string was entered', async ({ page }) => { - const todoItems = page.getByTestId('todo-item'); - await todoItems.nth(1).dblclick(); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill(''); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter'); - - await expect(todoItems).toHaveText([ - TODO_ITEMS[0], - TODO_ITEMS[2], - ]); - }); - - test('should cancel edits on escape', async ({ page }) => { - const todoItems = page.getByTestId('todo-item'); - await todoItems.nth(1).dblclick(); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages'); - await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Escape'); - await expect(todoItems).toHaveText(TODO_ITEMS); - }); -}); - -test.describe('Counter', () => { - test('should display the current number of todo items', async ({ page }) => { - // create a new todo locator - const newTodo = page.getByPlaceholder('What needs to be done?'); - - // create a todo count locator - const todoCount = page.getByTestId('todo-count') - - await newTodo.fill(TODO_ITEMS[0]); - await newTodo.press('Enter'); - - await expect(todoCount).toContainText('1'); - - await newTodo.fill(TODO_ITEMS[1]); - await newTodo.press('Enter'); - await expect(todoCount).toContainText('2'); - - await checkNumberOfTodosInLocalStorage(page, 2); - }); -}); - -test.describe('Clear completed button', () => { - test.beforeEach(async ({ page }) => { - await createDefaultTodos(page); - }); - - test('should display the correct text', async ({ page }) => { - await page.locator('.todo-list li .toggle').first().check(); - await expect(page.getByRole('button', { name: 'Clear completed' })).toBeVisible(); - }); - - test('should remove completed items when clicked', async ({ page }) => { - const todoItems = page.getByTestId('todo-item'); - await todoItems.nth(1).getByRole('checkbox').check(); - await page.getByRole('button', { name: 'Clear completed' }).click(); - await expect(todoItems).toHaveCount(2); - await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]); - }); - - test('should be hidden when there are no items that are completed', async ({ page }) => { - await page.locator('.todo-list li .toggle').first().check(); - await page.getByRole('button', { name: 'Clear completed' }).click(); - await expect(page.getByRole('button', { name: 'Clear completed' })).toBeHidden(); - }); -}); - -test.describe('Persistence', () => { - test('should persist its data', async ({ page }) => { - // create a new todo locator - const newTodo = page.getByPlaceholder('What needs to be done?'); - - for (const item of TODO_ITEMS.slice(0, 2)) { - await newTodo.fill(item); - await newTodo.press('Enter'); - } - - const todoItems = page.getByTestId('todo-item'); - const firstTodoCheck = todoItems.nth(0).getByRole('checkbox'); - await firstTodoCheck.check(); - await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]); - await expect(firstTodoCheck).toBeChecked(); - await expect(todoItems).toHaveClass(['completed', '']); - - // Ensure there is 1 completed item. - await checkNumberOfCompletedTodosInLocalStorage(page, 1); - - // Now reload. - await page.reload(); - await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]); - await expect(firstTodoCheck).toBeChecked(); - await expect(todoItems).toHaveClass(['completed', '']); - }); -}); - -test.describe('Routing', () => { - test.beforeEach(async ({ page }) => { - await createDefaultTodos(page); - // make sure the app had a chance to save updated todos in storage - // before navigating to a new view, otherwise the items can get lost :( - // in some frameworks like Durandal - await checkTodosInLocalStorage(page, TODO_ITEMS[0]); - }); - - test('should allow me to display active items', async ({ page }) => { - const todoItem = page.getByTestId('todo-item'); - await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check(); - - await checkNumberOfCompletedTodosInLocalStorage(page, 1); - await page.getByRole('link', { name: 'Active' }).click(); - await expect(todoItem).toHaveCount(2); - await expect(todoItem).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]); - }); - - test('should respect the back button', async ({ page }) => { - const todoItem = page.getByTestId('todo-item'); - await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check(); - - await checkNumberOfCompletedTodosInLocalStorage(page, 1); - - await test.step('Showing all items', async () => { - await page.getByRole('link', { name: 'All' }).click(); - await expect(todoItem).toHaveCount(3); - }); - - await test.step('Showing active items', async () => { - await page.getByRole('link', { name: 'Active' }).click(); - }); - - await test.step('Showing completed items', async () => { - await page.getByRole('link', { name: 'Completed' }).click(); - }); - - await expect(todoItem).toHaveCount(1); - await page.goBack(); - await expect(todoItem).toHaveCount(2); - await page.goBack(); - await expect(todoItem).toHaveCount(3); - }); - - test('should allow me to display completed items', async ({ page }) => { - await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check(); - await checkNumberOfCompletedTodosInLocalStorage(page, 1); - await page.getByRole('link', { name: 'Completed' }).click(); - await expect(page.getByTestId('todo-item')).toHaveCount(1); - }); - - test('should allow me to display all items', async ({ page }) => { - await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check(); - await checkNumberOfCompletedTodosInLocalStorage(page, 1); - await page.getByRole('link', { name: 'Active' }).click(); - await page.getByRole('link', { name: 'Completed' }).click(); - await page.getByRole('link', { name: 'All' }).click(); - await expect(page.getByTestId('todo-item')).toHaveCount(3); - }); - - test('should highlight the currently applied filter', async ({ page }) => { - await expect(page.getByRole('link', { name: 'All' })).toHaveClass('selected'); - - //create locators for active and completed links - const activeLink = page.getByRole('link', { name: 'Active' }); - const completedLink = page.getByRole('link', { name: 'Completed' }); - await activeLink.click(); - - // Page change - active items. - await expect(activeLink).toHaveClass('selected'); - await completedLink.click(); - - // Page change - completed items. - await expect(completedLink).toHaveClass('selected'); - }); -}); - -async function createDefaultTodos(page: Page) { - // create a new todo locator - const newTodo = page.getByPlaceholder('What needs to be done?'); - - for (const item of TODO_ITEMS) { - await newTodo.fill(item); - await newTodo.press('Enter'); - } -} - -async function checkNumberOfTodosInLocalStorage(page: Page, expected: number) { - return await page.waitForFunction(e => { - return JSON.parse(localStorage['react-todos']).length === e; - }, expected); -} - -async function checkNumberOfCompletedTodosInLocalStorage(page: Page, expected: number) { - return await page.waitForFunction(e => { - return JSON.parse(localStorage['react-todos']).filter((todo: any) => todo.completed).length === e; - }, expected); -} - -async function checkTodosInLocalStorage(page: Page, title: string) { - return await page.waitForFunction(t => { - return JSON.parse(localStorage['react-todos']).map((todo: any) => todo.title).includes(t); - }, title); -} diff --git a/Services/client/tests/example.spec.ts b/Services/client/tests/example.spec.ts deleted file mode 100644 index 54a906a..0000000 --- a/Services/client/tests/example.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { test, expect } from '@playwright/test'; - -test('has title', async ({ page }) => { - await page.goto('https://playwright.dev/'); - - // Expect a title "to contain" a substring. - await expect(page).toHaveTitle(/Playwright/); -}); - -test('get started link', async ({ page }) => { - await page.goto('https://playwright.dev/'); - - // Click the get started link. - await page.getByRole('link', { name: 'Get started' }).click(); - - // Expects page to have a heading with the name of Installation. - await expect(page.getByRole('heading', { name: 'Installation' })).toBeVisible(); -}); diff --git a/Services/client/tests/file.txt b/Services/client/tests/file.txt new file mode 100644 index 0000000..0d09132 --- /dev/null +++ b/Services/client/tests/file.txt @@ -0,0 +1 @@ +Test by Playwright! diff --git a/Services/client/tests/upload-file-grid-view.spec.ts b/Services/client/tests/upload-file-grid-view.spec.ts new file mode 100644 index 0000000..97126dc --- /dev/null +++ b/Services/client/tests/upload-file-grid-view.spec.ts @@ -0,0 +1,89 @@ +import { test, expect, Page } from '@playwright/test' + +test.describe.configure({ mode: 'serial' }) + +let page: Page + +test.beforeAll(async ({ browser }) => { + page = await browser.newPage() +}) + +test.afterAll(async () => { + await page.reload() + await page.click("//button[@data-testid='actiontest-upload-file/']") + await page.click("(//div[@id='FileltemActiondelete']//div)[2]") + await page.click("(//button[@id='dialogDeleteConfirm']//span)[2]") + await page.close() +}) + +test('Login', async ({}) => { + await page.goto('http://localhost:27015/admin') + + await expect(page).toHaveTitle('Sign in to EDM') + await page.fill("input[name='username']", 'admin') + await page.fill("input[name='password']", 'P@ssw0rd') + await page.click("input[name='login']") +}) + +test('Create Cabinet', async () => { + await page.click("//div[@id='triggerFolderCreateFileItem']") + await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-upload-file') + await page.click("(//span[text()='บันทึก'])[2]") + await expect(page.locator("(//div[@class='col'])[3]")).toContainText( + /test-upload-file/, + ) +}) + +test('Go into Cabinet', async () => { + await page.click("//div[@data-pathname='test-upload-file/']") + await expect( + page.locator("//div[contains(@class,'flex items-center')]//div[1]"), + ).toContainText(/test-upload-file/) +}) + +test('Create Drawer', async () => { + await page.click("//div[@id='triggerFolderCreateFileItem']") + await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-upload-file') + await page.click("(//span[text()='บันทึก'])[2]") + await expect(page.locator("(//div[@class='col'])[3]")).toContainText( + /test-upload-file/, + ) +}) + +test('Go into Drawer', async () => { + await page.click("//div[@data-pathname='test-upload-file/test-upload-file/']") + await expect( + page.locator("//div[contains(@class,'flex items-center')]//div[3]"), + ).toContainText(/test-upload-file/) +}) + +test('Create Folder', async () => { + await page.click("//div[@id='triggerFolderCreateFileItem']") + await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-upload-file') + await page.click("(//span[text()='บันทึก'])[2]") + await expect(page.locator("(//div[@class='col'])[3]")).toContainText( + /test-upload-file/, + ) +}) + +test('Go into Folder', async () => { + await page.click( + "//div[@data-pathname='test-upload-file/test-upload-file/test-upload-file/']", + ) + await expect( + page.locator("//div[contains(@class,'flex items-center')]//div[5]"), + ).toContainText(/test-upload-file/) +}) + +test('Upload File', async () => { + await page.click("//div[@id='triggerFileCreateFileItem']") + await page.setInputFiles("//input[@type='file']", 'tests/file.txt') + await page.fill("//input[@placeholder='กรอกชื่อเรื่อง']", 'test-upload-file') + await page.click("(//form[@class='q-form']//button)[2]") + await page.waitForTimeout(3000) + await expect( + page.locator( + "//div[@data-pathname='test-upload-file/test-upload-file/test-upload-file/test-upload.txt']", + ), + ).toContainText(/test-upload-file/) +}) diff --git a/Services/server/.env.example b/Services/server/.env.example index 7dc2098..4e5938b 100644 --- a/Services/server/.env.example +++ b/Services/server/.env.example @@ -1,15 +1,25 @@ +# Keycloak public key PUBLIC_KEY= - -MINIO_HOST=localhost -MINIO_PORT=9000 +REALM_URL= +PREFERRED_AUTH= +MANAGEMENT_ROLE= +# App port +PORT= +# Real host name must be used. +# Sdk will generate presigned url based on host name. +MINIO_HOST= +MINIO_PORT= +MINIO_SSL= MINIO_ACCESS_KEY= MINIO_SECRET_KEY= +# Bucket notification event needed to be configured +# Can use prepare script to create bucket +MINIO_BUCKET= +ELASTICSEARCH_PROTOCOL= +ELASTICSEARCH_HOST= +ELASTICSEARCH_PORT= +# Can use prepare script +ELASTICSEARCH_INDEX= +AMQ_URL= +AMQ_QUEUE= -ELASTICSEARCH_PROTOCOL=http -ELASTICSEARCH_HOST=localhost -ELASTICSEARCH_PORT=9200 - -AMQ_URL=amqp://admin:1234@localhost:9999 -AMQ_QUEUE=queue - -AUTH_BYPASS=false # MUST NOT TURN THIS ON IN PRODUCTION From 72e2023abd2c98a5689c9e8718af5b96460f64ce Mon Sep 17 00:00:00 2001 From: somnetsak123 Date: Wed, 6 Dec 2023 11:39:37 +0700 Subject: [PATCH 2/2] fix: icon outline --- Services/client/src/components/FileItemAction.vue | 6 +++--- Services/client/src/components/FileSearched.vue | 6 +++--- Services/client/src/components/ListView.vue | 14 ++++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Services/client/src/components/FileItemAction.vue b/Services/client/src/components/FileItemAction.vue index 93c80ca..14cabe5 100644 --- a/Services/client/src/components/FileItemAction.vue +++ b/Services/client/src/components/FileItemAction.vue @@ -17,8 +17,8 @@ const props =
- - แก้ไข + + แก้ไข
@@ -29,7 +29,7 @@ const props = >
- + ลบ
diff --git a/Services/client/src/components/FileSearched.vue b/Services/client/src/components/FileSearched.vue index 4fb2121..8a4409a 100644 --- a/Services/client/src/components/FileSearched.vue +++ b/Services/client/src/components/FileSearched.vue @@ -320,7 +320,7 @@ onMounted(() => {