Skip to content

Commit 0eeb11e

Browse files
mdjastrzebskimdjastrzebski
committed
chore: tweak deprecating messages
1 parent f670786 commit 0eeb11e

File tree

4 files changed

+135
-75
lines changed

4 files changed

+135
-75
lines changed

‎src/helpers/deprecation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function deprecateQuery<QueryFn extends (...args: any) => any>(
2323
const wrapper: QueryFn = (...args: any) => {
2424
// eslint-disable-next-line no-console
2525
console.warn(
26-
`${queryName}(...) is deprecated. Please use ${recommendation} instead.`
26+
`${queryName}(...) is deprecated.\n\nPlease use ${recommendation} instead.`
2727
);
2828

2929
return queryFn(...args);

‎src/queries/__tests__/a11yState.test.tsx

Lines changed: 72 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -264,67 +264,103 @@ test('*ByA11yState deprecation warnings', () => {
264264
const view = render(<View accessibilityState={{ disabled: true }} />);
265265

266266
view.getByA11yState({ disabled: true });
267-
expect(mockCalls[0][0]).toMatchInlineSnapshot(
268-
`"getByA11yState(...) is deprecated. Please use getByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
269-
);
267+
expect(mockCalls[0][0]).toMatchInlineSnapshot(`
268+
"getByA11yState(...) is deprecated.
269+
270+
Please use getByRole(role, { disabled, selected, checked, busy, expanded }) query
271+
or expect(...).toHaveAccessibilityState(...) matcher instead."
272+
`);
270273

271274
view.getAllByA11yState({ disabled: true });
272-
expect(mockCalls[1][0]).toMatchInlineSnapshot(
273-
`"getAllByA11yState(...) is deprecated. Please use getAllByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
274-
);
275+
expect(mockCalls[1][0]).toMatchInlineSnapshot(`
276+
"getAllByA11yState(...) is deprecated.
277+
278+
Please use getAllByRole(role, { disabled, selected, checked, busy, expanded }) query
279+
or expect(...).toHaveAccessibilityState(...) matcher instead."
280+
`);
275281

276282
view.queryByA11yState({ disabled: true });
277-
expect(mockCalls[2][0]).toMatchInlineSnapshot(
278-
`"queryByA11yState(...) is deprecated. Please use queryByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
279-
);
283+
expect(mockCalls[2][0]).toMatchInlineSnapshot(`
284+
"queryByA11yState(...) is deprecated.
285+
286+
Please use queryByRole(role, { disabled, selected, checked, busy, expanded }) query
287+
or expect(...).toHaveAccessibilityState(...) matcher instead."
288+
`);
280289

281290
view.queryAllByA11yState({ disabled: true });
282-
expect(mockCalls[3][0]).toMatchInlineSnapshot(
283-
`"queryAllByA11yState(...) is deprecated. Please use queryAllByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
284-
);
291+
expect(mockCalls[3][0]).toMatchInlineSnapshot(`
292+
"queryAllByA11yState(...) is deprecated.
293+
294+
Please use queryAllByRole(role, { disabled, selected, checked, busy, expanded }) query
295+
or expect(...).toHaveAccessibilityState(...) matcher instead."
296+
`);
285297

286298
view.findByA11yState({ disabled: true });
287-
expect(mockCalls[4][0]).toMatchInlineSnapshot(
288-
`"findByA11yState(...) is deprecated. Please use findByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
289-
);
299+
expect(mockCalls[4][0]).toMatchInlineSnapshot(`
300+
"findByA11yState(...) is deprecated.
301+
302+
Please use findByRole(role, { disabled, selected, checked, busy, expanded }) query
303+
or expect(...).toHaveAccessibilityState(...) matcher instead."
304+
`);
290305

291306
view.findAllByA11yState({ disabled: true });
292-
expect(mockCalls[5][0]).toMatchInlineSnapshot(
293-
`"findAllByA11yState(...) is deprecated. Please use findAllByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
294-
);
307+
expect(mockCalls[5][0]).toMatchInlineSnapshot(`
308+
"findAllByA11yState(...) is deprecated.
309+
310+
Please use findAllByRole(role, { disabled, selected, checked, busy, expanded }) query
311+
or expect(...).toHaveAccessibilityState(...) matcher instead."
312+
`);
295313
});
296314

297315
test('*ByAccessibilityState deprecation warnings', () => {
298316
const mockCalls = (console.warn as ConsoleLogMock).mock.calls;
299317
const view = render(<View accessibilityState={{ disabled: true }} />);
300318

301319
view.getByAccessibilityState({ disabled: true });
302-
expect(mockCalls[0][0]).toMatchInlineSnapshot(
303-
`"getByAccessibilityState(...) is deprecated. Please use getByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
304-
);
320+
expect(mockCalls[0][0]).toMatchInlineSnapshot(`
321+
"getByAccessibilityState(...) is deprecated.
322+
323+
Please use getByRole(role, { disabled, selected, checked, busy, expanded }) query
324+
or expect(...).toHaveAccessibilityState(...) matcher instead."
325+
`);
305326

306327
view.getAllByAccessibilityState({ disabled: true });
307-
expect(mockCalls[1][0]).toMatchInlineSnapshot(
308-
`"getAllByAccessibilityState(...) is deprecated. Please use getAllByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
309-
);
328+
expect(mockCalls[1][0]).toMatchInlineSnapshot(`
329+
"getAllByAccessibilityState(...) is deprecated.
330+
331+
Please use getAllByRole(role, { disabled, selected, checked, busy, expanded }) query
332+
or expect(...).toHaveAccessibilityState(...) matcher instead."
333+
`);
310334

311335
view.queryByAccessibilityState({ disabled: true });
312-
expect(mockCalls[2][0]).toMatchInlineSnapshot(
313-
`"queryByAccessibilityState(...) is deprecated. Please use queryByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
314-
);
336+
expect(mockCalls[2][0]).toMatchInlineSnapshot(`
337+
"queryByAccessibilityState(...) is deprecated.
338+
339+
Please use queryByRole(role, { disabled, selected, checked, busy, expanded }) query
340+
or expect(...).toHaveAccessibilityState(...) matcher instead."
341+
`);
315342

316343
view.queryAllByAccessibilityState({ disabled: true });
317-
expect(mockCalls[3][0]).toMatchInlineSnapshot(
318-
`"queryAllByAccessibilityState(...) is deprecated. Please use queryAllByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
319-
);
344+
expect(mockCalls[3][0]).toMatchInlineSnapshot(`
345+
"queryAllByAccessibilityState(...) is deprecated.
346+
347+
Please use queryAllByRole(role, { disabled, selected, checked, busy, expanded }) query
348+
or expect(...).toHaveAccessibilityState(...) matcher instead."
349+
`);
320350

321351
view.findByAccessibilityState({ disabled: true });
322-
expect(mockCalls[4][0]).toMatchInlineSnapshot(
323-
`"findByAccessibilityState(...) is deprecated. Please use findByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
324-
);
352+
expect(mockCalls[4][0]).toMatchInlineSnapshot(`
353+
"findByAccessibilityState(...) is deprecated.
354+
355+
Please use findByRole(role, { disabled, selected, checked, busy, expanded }) query
356+
or expect(...).toHaveAccessibilityState(...) matcher instead."
357+
`);
325358

326359
view.findAllByAccessibilityState({ disabled: true });
327-
expect(mockCalls[5][0]).toMatchInlineSnapshot(
328-
`"findAllByAccessibilityState(...) is deprecated. Please use findAllByRole(role, { disabled, selected, checked, busy, expanded }) instead."`
329-
);
360+
expect(mockCalls[5][0]).toMatchInlineSnapshot(`
361+
"findAllByAccessibilityState(...) is deprecated.
362+
363+
Please use findAllByRole(role, { disabled, selected, checked, busy, expanded }) query
364+
or expect(...).toHaveAccessibilityState(...) matcher instead."
365+
`);
330366
});

‎src/queries/__tests__/a11yValue.test.tsx

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -143,67 +143,91 @@ test('*ByA11yValue deprecation warnings', () => {
143143
const view = render(<View accessibilityValue={{ min: 10 }} />);
144144

145145
view.getByA11yValue({ min: 10 });
146-
expect(mockCalls[0][0]).toMatchInlineSnapshot(
147-
`"getByA11yValue(...) is deprecated. Please use getByRole(role, { value: ... }) instead."`
148-
);
146+
expect(mockCalls[0][0]).toMatchInlineSnapshot(`
147+
"getByA11yValue(...) is deprecated.
148+
149+
Please use getByRole(role, { value: ... }) instead."
150+
`);
149151

150152
view.getAllByA11yValue({ min: 10 });
151-
expect(mockCalls[1][0]).toMatchInlineSnapshot(
152-
`"getAllByA11yValue(...) is deprecated. Please use getAllByRole(role, { value: ... }) instead."`
153-
);
153+
expect(mockCalls[1][0]).toMatchInlineSnapshot(`
154+
"getAllByA11yValue(...) is deprecated.
155+
156+
Please use getAllByRole(role, { value: ... }) instead."
157+
`);
154158

155159
view.queryByA11yValue({ min: 10 });
156-
expect(mockCalls[2][0]).toMatchInlineSnapshot(
157-
`"queryByA11yValue(...) is deprecated. Please use queryByRole(role, { value: ... }) instead."`
158-
);
160+
expect(mockCalls[2][0]).toMatchInlineSnapshot(`
161+
"queryByA11yValue(...) is deprecated.
162+
163+
Please use queryByRole(role, { value: ... }) instead."
164+
`);
159165

160166
view.queryAllByA11yValue({ min: 10 });
161-
expect(mockCalls[3][0]).toMatchInlineSnapshot(
162-
`"queryAllByA11yValue(...) is deprecated. Please use queryAllByRole(role, { value: ... }) instead."`
163-
);
167+
expect(mockCalls[3][0]).toMatchInlineSnapshot(`
168+
"queryAllByA11yValue(...) is deprecated.
169+
170+
Please use queryAllByRole(role, { value: ... }) instead."
171+
`);
164172

165173
view.findByA11yValue({ min: 10 });
166-
expect(mockCalls[4][0]).toMatchInlineSnapshot(
167-
`"findByA11yValue(...) is deprecated. Please use findByRole(role, { value: ... }) instead."`
168-
);
174+
expect(mockCalls[4][0]).toMatchInlineSnapshot(`
175+
"findByA11yValue(...) is deprecated.
176+
177+
Please use findByRole(role, { value: ... }) instead."
178+
`);
169179

170180
view.findAllByA11yValue({ min: 10 });
171-
expect(mockCalls[5][0]).toMatchInlineSnapshot(
172-
`"findAllByA11yValue(...) is deprecated. Please use findAllByRole(role, { value: ... }) instead."`
173-
);
181+
expect(mockCalls[5][0]).toMatchInlineSnapshot(`
182+
"findAllByA11yValue(...) is deprecated.
183+
184+
Please use findAllByRole(role, { value: ... }) instead."
185+
`);
174186
});
175187

176188
test('*ByAccessibilityValue deprecation warnings', () => {
177189
const mockCalls = (console.warn as ConsoleLogMock).mock.calls;
178190
const view = render(<View accessibilityValue={{ min: 10 }} />);
179191

180192
view.getByAccessibilityValue({ min: 10 });
181-
expect(mockCalls[0][0]).toMatchInlineSnapshot(
182-
`"getByAccessibilityValue(...) is deprecated. Please use getByRole(role, { value: ... }) instead."`
183-
);
193+
expect(mockCalls[0][0]).toMatchInlineSnapshot(`
194+
"getByAccessibilityValue(...) is deprecated.
195+
196+
Please use getByRole(role, { value: ... }) instead."
197+
`);
184198

185199
view.getAllByAccessibilityValue({ min: 10 });
186-
expect(mockCalls[1][0]).toMatchInlineSnapshot(
187-
`"getAllByAccessibilityValue(...) is deprecated. Please use getAllByRole(role, { value: ... }) instead."`
188-
);
200+
expect(mockCalls[1][0]).toMatchInlineSnapshot(`
201+
"getAllByAccessibilityValue(...) is deprecated.
202+
203+
Please use getAllByRole(role, { value: ... }) instead."
204+
`);
189205

190206
view.queryByAccessibilityValue({ min: 10 });
191-
expect(mockCalls[2][0]).toMatchInlineSnapshot(
192-
`"queryByAccessibilityValue(...) is deprecated. Please use queryByRole(role, { value: ... }) instead."`
193-
);
207+
expect(mockCalls[2][0]).toMatchInlineSnapshot(`
208+
"queryByAccessibilityValue(...) is deprecated.
209+
210+
Please use queryByRole(role, { value: ... }) instead."
211+
`);
194212

195213
view.queryAllByAccessibilityValue({ min: 10 });
196-
expect(mockCalls[3][0]).toMatchInlineSnapshot(
197-
`"queryAllByAccessibilityValue(...) is deprecated. Please use queryAllByRole(role, { value: ... }) instead."`
198-
);
214+
expect(mockCalls[3][0]).toMatchInlineSnapshot(`
215+
"queryAllByAccessibilityValue(...) is deprecated.
216+
217+
Please use queryAllByRole(role, { value: ... }) instead."
218+
`);
199219

200220
view.findByAccessibilityValue({ min: 10 });
201-
expect(mockCalls[4][0]).toMatchInlineSnapshot(
202-
`"findByAccessibilityValue(...) is deprecated. Please use findByRole(role, { value: ... }) instead."`
203-
);
221+
expect(mockCalls[4][0]).toMatchInlineSnapshot(`
222+
"findByAccessibilityValue(...) is deprecated.
223+
224+
Please use findByRole(role, { value: ... }) instead."
225+
`);
204226

205227
view.findAllByAccessibilityValue({ min: 10 });
206-
expect(mockCalls[5][0]).toMatchInlineSnapshot(
207-
`"findAllByAccessibilityValue(...) is deprecated. Please use findAllByRole(role, { value: ... }) instead."`
208-
);
228+
expect(mockCalls[5][0]).toMatchInlineSnapshot(`
229+
"findAllByAccessibilityValue(...) is deprecated.
230+
231+
Please use findAllByRole(role, { value: ... }) instead."
232+
`);
209233
});

‎src/queries/a11yState.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const bindByA11yStateQueries = (
103103
findAllByA11yState,
104104
},
105105
'A11yState',
106-
'Role(role, { disabled, selected, checked, busy, expanded })'
106+
'Role(role, { disabled, selected, checked, busy, expanded }) query\nor expect(...).toHaveAccessibilityState(...) matcher'
107107
),
108108

109109
...deprecateAllQueries(
@@ -116,7 +116,7 @@ export const bindByA11yStateQueries = (
116116
findAllByAccessibilityState: findAllByA11yState,
117117
},
118118
'AccessibilityState',
119-
'Role(role, { disabled, selected, checked, busy, expanded })'
119+
'Role(role, { disabled, selected, checked, busy, expanded }) query\nor expect(...).toHaveAccessibilityState(...) matcher'
120120
),
121121
};
122122
};

0 commit comments

Comments
 (0)