Skip to content

Commit e34273c

Browse files
committed
fix: failing tests and AutoCompleteInput type
1 parent 9ab351d commit e34273c

File tree

5 files changed

+33
-26
lines changed

5 files changed

+33
-26
lines changed

package/src/components/AutoCompleteInput/AutoCompleteInput.tsx

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,26 @@ type AutoCompleteInputPropsWithContext = Pick<
7272
cooldownActive?: boolean;
7373
};
7474

75-
export type AutoCompleteInputProps = Partial<AutoCompleteInputPropsWithContext>;
75+
export type AutoCompleteInputProps = Partial<
76+
Omit<
77+
AutoCompleteInputPropsWithContext,
78+
| 'triggerSettings'
79+
| 'mentionAllAppUsersQuery'
80+
| 'mentionAllAppUsersEnabled'
81+
| 'autoCompleteSuggestionsLimit'
82+
>
83+
>;
7684

7785
const AutoCompleteInputWithContext = (props: AutoCompleteInputPropsWithContext) => {
7886
const {
7987
additionalTextInputProps,
88+
autoCompleteSuggestionsLimit,
8089
closeSuggestions,
8190
cooldownActive = false,
8291
giphyActive,
8392
giphyEnabled,
93+
mentionAllAppUsersEnabled,
94+
mentionAllAppUsersQuery,
8495
maxMessageLength,
8596
numberOfLines,
8697
onChange,
@@ -89,16 +100,10 @@ const AutoCompleteInputWithContext = (props: AutoCompleteInputPropsWithContext)
89100
setInputBoxRef,
90101
t,
91102
text,
103+
triggerSettings,
92104
updateSuggestions: updateSuggestionsContext,
93105
} = props;
94106

95-
const {
96-
autoCompleteSuggestionsLimit,
97-
mentionAllAppUsersEnabled,
98-
mentionAllAppUsersQuery,
99-
triggerSettings,
100-
} = useMessageInputContext();
101-
102107
const isTrackingStarted = useRef(false);
103108
const selectionEnd = useRef(0);
104109
const [textHeight, setTextHeight] = useState(0);

package/src/components/AutoCompleteInput/__tests__/AutoCompleteInput.test.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { generateChannelResponse } from '../../../mock-builders/generator/channe
99
import { generateUser } from '../../../mock-builders/generator/user';
1010
import { getTestClientWithUser } from '../../../mock-builders/mock';
1111
import { ACITriggerSettings } from '../../../utils/ACITriggerSettings';
12+
import { Channel } from '../../Channel/Channel';
1213
import { Chat } from '../../Chat/Chat';
1314
import { AutoCompleteInput } from '../AutoCompleteInput';
1415

@@ -19,18 +20,17 @@ describe('AutoCompleteInput', () => {
1920

2021
const getComponent = (props = {}) => (
2122
<Chat client={chatClient}>
22-
<SuggestionsProvider value={props}>
23-
<AutoCompleteInput
24-
giphyEnabled
25-
onChange={jest.fn}
26-
text={props.text}
27-
triggerSettings={ACITriggerSettings({
28-
channel,
29-
onMentionSelectItem: jest.fn(),
30-
t: jest.fn(),
31-
})}
32-
/>
33-
</SuggestionsProvider>
23+
<Channel
24+
channel={channel}
25+
triggerSettings={ACITriggerSettings({
26+
channel,
27+
onMentionSelectItem: jest.fn(),
28+
t: jest.fn(),
29+
})}
30+
>
31+
<AutoCompleteInput giphyEnabled onChange={jest.fn} text={props.text} />
32+
<SuggestionsProvider value={props} />
33+
</Channel>
3434
</Chat>
3535
);
3636

package/src/components/MessageInput/__tests__/FileUploadPreview.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ describe('FileUploadPreview', () => {
332332
const fileUploads = [
333333
generateFileUploadPreview({
334334
id: 'file-upload-id-1',
335-
mimeType: 'audio/mp3',
336335
state: FileState.UPLOADED,
336+
type: 'audio/mp3',
337337
}),
338338
];
339339
const removeFile = jest.fn();

package/src/components/MessageInput/__tests__/MessageInput.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ describe('MessageInput', () => {
129129
);
130130

131131
// Both for files and for images triggered in one test itself.
132-
expect(Alert.alert).toHaveBeenCalledTimes(4);
132+
await waitFor(() => {
133+
expect(Alert.alert).toHaveBeenCalledTimes(4);
134+
});
133135
});
134136

135137
it('should start the audio recorder on long press and cleanup on unmount', async () => {

package/src/contexts/messageInputContext/__tests__/__snapshots__/sendMessage.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ exports[`MessageInputContext's sendMessage exit sendMessage when file upload sta
4646
{
4747
"asset_url": undefined,
4848
"file_size": undefined,
49-
"mime_type": undefined,
49+
"mime_type": "file",
5050
"originalFile": {
5151
"name": "dummy.pdf",
5252
"state": "uploaded",
@@ -58,7 +58,7 @@ exports[`MessageInputContext's sendMessage exit sendMessage when file upload sta
5858
{
5959
"asset_url": undefined,
6060
"file_size": undefined,
61-
"mime_type": undefined,
61+
"mime_type": "video/mp4",
6262
"originalFile": {
6363
"name": "dummy.pdf",
6464
"state": "finished",
@@ -70,7 +70,7 @@ exports[`MessageInputContext's sendMessage exit sendMessage when file upload sta
7070
{
7171
"asset_url": undefined,
7272
"file_size": undefined,
73-
"mime_type": undefined,
73+
"mime_type": "audio/mp3",
7474
"originalFile": {
7575
"name": "dummy.pdf",
7676
"state": "uploaded",
@@ -82,7 +82,7 @@ exports[`MessageInputContext's sendMessage exit sendMessage when file upload sta
8282
{
8383
"asset_url": undefined,
8484
"file_size": undefined,
85-
"mime_type": undefined,
85+
"mime_type": "image/jpeg",
8686
"originalFile": {
8787
"name": "dummy.pdf",
8888
"state": "finished",

0 commit comments

Comments
 (0)