-
Notifications
You must be signed in to change notification settings - Fork 11.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: no spaces between emoji aliases (#33278)
- Loading branch information
1 parent
daa1934
commit 41d1cd5
Showing
3 changed files
with
85 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@rocket.chat/meteor': patch | ||
--- | ||
|
||
Fixes display of emoji aliases in custom emoji list by adding commas between aliases |
79 changes: 79 additions & 0 deletions
79
apps/meteor/client/views/admin/customEmoji/CustomEmoji.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
import { mockAppRoot } from '@rocket.chat/mock-providers'; | ||
import { render, screen, waitFor } from '@testing-library/react'; | ||
import React from 'react'; | ||
|
||
import '@testing-library/jest-dom'; | ||
|
||
import CustomEmoji from './CustomEmoji'; | ||
|
||
const appRoot = mockAppRoot().withEndpoint('GET', '/v1/emoji-custom.all', () => ({ | ||
count: 1, | ||
offset: 0, | ||
total: 1, | ||
success: true, | ||
emojis: [ | ||
{ | ||
_id: '1', | ||
name: 'smile', | ||
aliases: ['happy', 'joy'], | ||
extension: 'webp', | ||
_updatedAt: new Date().toISOString(), | ||
etag: 'abcdef', | ||
}, | ||
], | ||
})); | ||
|
||
describe('CustomEmoji Component', () => { | ||
const mockRef = { current: jest.fn() }; | ||
const mockOnClick = jest.fn(); | ||
|
||
it('renders emoji list', async () => { | ||
render(<CustomEmoji onClick={mockOnClick} reload={mockRef} />, { | ||
legacyRoot: true, | ||
wrapper: appRoot.build(), | ||
}); | ||
|
||
await waitFor(() => { | ||
expect(screen.getByText('smile')).toBeInTheDocument(); | ||
}); | ||
}); | ||
|
||
it("renders emoji's aliases as comma-separated values when aliases is an array", async () => { | ||
render(<CustomEmoji onClick={mockOnClick} reload={mockRef} />, { | ||
legacyRoot: true, | ||
wrapper: appRoot.build(), | ||
}); | ||
|
||
await waitFor(() => { | ||
expect(screen.getByText('happy, joy')).toBeInTheDocument(); | ||
}); | ||
}); | ||
|
||
it("renders emoji's aliases values when aliases is a string", async () => { | ||
render(<CustomEmoji onClick={mockOnClick} reload={mockRef} />, { | ||
legacyRoot: true, | ||
wrapper: mockAppRoot() | ||
.withEndpoint('GET', '/v1/emoji-custom.all', () => ({ | ||
count: 1, | ||
offset: 0, | ||
total: 1, | ||
success: true, | ||
emojis: [ | ||
{ | ||
_id: '1', | ||
name: 'smile', | ||
aliases: 'happy' as any, | ||
extension: 'webp', | ||
_updatedAt: new Date().toISOString(), | ||
etag: 'abcdef', | ||
}, | ||
], | ||
})) | ||
.build(), | ||
}); | ||
|
||
await waitFor(() => { | ||
expect(screen.getByText('happy')).toBeInTheDocument(); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters