From 62cc29c191d0fd993bfb06da0b01c8ea861c5cc9 Mon Sep 17 00:00:00 2001 From: Thilo Aschebrock Date: Fri, 15 Sep 2023 17:41:04 +1000 Subject: [PATCH] Rename "kick" to "remove" Signed-off-by: Thilo Aschebrock --- backend/sendmessage/src/remove-user.ts | 2 +- e2e/kicking.spec.ts | 6 +++--- e2e/pages/card-page.ts | 4 ++-- e2e/pages/login-page.ts | 4 ++-- frontend/src/Components/App/App.test.tsx | 10 +++++----- .../RemoveUserButton.module.css} | 0 .../RemoveUserButton.tsx} | 8 ++++---- .../VotingStateDisplay/VotingStateDisplay.tsx | 8 ++++---- frontend/src/constants.ts | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) rename frontend/src/Components/{KickButton/KickButton.module.css => RemoveUserButton/RemoveUserButton.module.css} (100%) rename frontend/src/Components/{KickButton/KickButton.tsx => RemoveUserButton/RemoveUserButton.tsx} (83%) diff --git a/backend/sendmessage/src/remove-user.ts b/backend/sendmessage/src/remove-user.ts index e2a69e6b..f2ad2f68 100644 --- a/backend/sendmessage/src/remove-user.ts +++ b/backend/sendmessage/src/remove-user.ts @@ -28,7 +28,7 @@ export const removeUser = async (user: string, config: ConfigWithHandler): Promi broadcastState(updatedGroupItem, config), userConnectionId && sendMessageToConnection( - { type: 'not-logged-in', payload: { reason: `You have been kicked out by ${userId}.` } }, + { type: 'not-logged-in', payload: { reason: `You have been removed by ${userId}.` } }, { ...config, connectionId: userConnectionId } ), ]); diff --git a/e2e/kicking.spec.ts b/e2e/kicking.spec.ts index 224fde1b..8ddd41d6 100644 --- a/e2e/kicking.spec.ts +++ b/e2e/kicking.spec.ts @@ -2,15 +2,15 @@ import { test } from '@playwright/test'; import { assertOnCardPage } from './pages/card-page'; import { assertOnLoginPage, login, loginWithSameSession } from './pages/login-page'; -test('allows to kick users', async ({ page, context }) => { +test('allows to remove users', async ({ page, context }) => { await login(page, 'User 1'); const secondPage = await context.newPage(); await loginWithSameSession(secondPage, 'User 2', page); const cardPage = await assertOnCardPage(page); - await cardPage.kickUser('User 2'); + await cardPage.removeUser('User 2'); await cardPage.assertVotingStateIs([{ name: 'User 1', state: 'Not voted' }]); const secondLoginPage = await assertOnLoginPage(secondPage); - await secondLoginPage.assertKickedBy('User 1'); + await secondLoginPage.assertRemovedBy('User 1'); }); diff --git a/e2e/pages/card-page.ts b/e2e/pages/card-page.ts index 609ce408..361b6948 100644 --- a/e2e/pages/card-page.ts +++ b/e2e/pages/card-page.ts @@ -57,8 +57,8 @@ export class CardPage { await expect(this.votes).toHaveCount(states.length); } - async kickUser(name: string) { - await this.votes.getByTitle(`Kick ${name} out`).click(); + async removeUser(name: string) { + await this.votes.getByTitle(`Remove ${name}`).click(); } async selectCard(value: CardValue) { diff --git a/e2e/pages/login-page.ts b/e2e/pages/login-page.ts index e16ba974..f74f3f14 100644 --- a/e2e/pages/login-page.ts +++ b/e2e/pages/login-page.ts @@ -25,8 +25,8 @@ export class LoginPage { await this.loginButton.click(); } - async assertKickedBy(name: string) { - await expect(this.alertText).toHaveText(`You have been kicked out by ${name}.`); + async assertRemovedBy(name: string) { + await expect(this.alertText).toHaveText(`You have been removed by ${name}.`); } async assertSessionTakeover() { diff --git a/frontend/src/Components/App/App.test.tsx b/frontend/src/Components/App/App.test.tsx index 187f9abc..b1ff0b98 100644 --- a/frontend/src/Components/App/App.test.tsx +++ b/frontend/src/Components/App/App.test.tsx @@ -106,7 +106,7 @@ describe('The App component', () => { expect(container.querySelector('input[type=submit]')).not.toBeDisabled(); }); - it('logs the user in and displays the voting page, then displays the login page if the user is kicked out', () => { + it('logs the user in and displays the voting page, then displays the login page if the user is removed', () => { // given const logoutReason = 'You were removed!'; const { socket, container, getByText } = loginUser(); @@ -131,7 +131,7 @@ describe('The App component', () => { expect(container.querySelector('input[type=submit]')).toBeVisible(); }); - it('updates, reveals and resets votes and kicks optimistically once the first state message arrived', () => { + it('updates, reveals and resets votes and removes users optimistically once the first state message arrived', () => { // given const { socket, container, getByRole, getAllByTitle } = loginUser(); @@ -139,7 +139,7 @@ describe('The App component', () => { const revealButton = getByRole('button', { name: 'reveal votes' }); expect(revealButton).toBeDisabled(); container.querySelectorAll('button.largeCard').forEach((card) => expect(card).toBeDisabled()); - getAllByTitle(/^Kick/).forEach((button) => expect(button).toBeDisabled()); + getAllByTitle(/^Remove/).forEach((button) => expect(button).toBeDisabled()); const changeScaleButton = getByRole('button', { name: 'Change Scale' }); expect(changeScaleButton).toBeDisabled(); @@ -164,7 +164,7 @@ describe('The App component', () => { // then expect(revealButton).toBeEnabled(); container.querySelectorAll('button.largeCard').forEach((card) => expect(card).toBeEnabled()); - getAllByTitle(/^Kick/).forEach((button) => expect(button).toBeEnabled()); + getAllByTitle(/^Remove/).forEach((button) => expect(button).toBeEnabled()); expect(changeScaleButton).toBeEnabled(); // when @@ -191,7 +191,7 @@ describe('The App component', () => { socket.test_messages = []; // when - fireEvent.click(getByRole('button', { name: 'Kick Non-voting User out' })); + fireEvent.click(getByRole('button', { name: 'Remove Non-voting User' })); // then expect(container.querySelector('tbody')).toHaveTextContent('Happy UserVoting User'); diff --git a/frontend/src/Components/KickButton/KickButton.module.css b/frontend/src/Components/RemoveUserButton/RemoveUserButton.module.css similarity index 100% rename from frontend/src/Components/KickButton/KickButton.module.css rename to frontend/src/Components/RemoveUserButton/RemoveUserButton.module.css diff --git a/frontend/src/Components/KickButton/KickButton.tsx b/frontend/src/Components/RemoveUserButton/RemoveUserButton.tsx similarity index 83% rename from frontend/src/Components/KickButton/KickButton.tsx rename to frontend/src/Components/RemoveUserButton/RemoveUserButton.tsx index d53c54a6..e4acf229 100644 --- a/frontend/src/Components/KickButton/KickButton.tsx +++ b/frontend/src/Components/RemoveUserButton/RemoveUserButton.tsx @@ -1,16 +1,16 @@ -import { BUTTON_KICK } from '../../constants'; +import { BUTTON_REMOVE_USER } from '../../constants'; import { connectToWebSocket } from '../WebSocket/WebSocket'; -import classes from './KickButton.module.css'; +import classes from './RemoveUserButton.module.css'; interface Props { user: string; } -export const KickButton = connectToWebSocket( +export const RemoveUserButton = connectToWebSocket( ({ socket: { connected, removeUser }, user }) => (