From 5b70db6f29e6090f4657cf9ffe0ce8c8ef47f1d2 Mon Sep 17 00:00:00 2001 From: Yama-Tomo Date: Sun, 29 Mar 2020 11:35:59 +0900 Subject: [PATCH 1/3] feat: redefine getElementError --- src/query-helpers.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/query-helpers.js b/src/query-helpers.js index 3e493699..dc81a1fd 100644 --- a/src/query-helpers.js +++ b/src/query-helpers.js @@ -2,6 +2,10 @@ import {fuzzyMatches, matches, makeNormalizer} from './matches' import {waitFor} from './wait-for' import {getConfig} from './config' +function getElementError(message, container) { + return getConfig().getElementError(message, container) +} + function getMultipleElementsFoundError(message, container) { return getConfig().getElementError( `${message}\n\n(If this is intentional, then use the \`*AllBy*\` variant of the query (like \`queryAllByText\`, \`getAllByText\`, or \`findAllByText\`)).`, @@ -82,6 +86,7 @@ function buildQueries(queryAllBy, getMultipleError, getMissingError) { } export { + getElementError, getMultipleElementsFoundError, queryAllByAttribute, queryByAttribute, From d1059c8e6e615f8e92d2f92701ea070316f86028 Mon Sep 17 00:00:00 2001 From: Yama-Tomo Date: Sun, 29 Mar 2020 11:37:55 +0900 Subject: [PATCH 2/3] test: add test --- src/__tests__/query-helper.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/__tests__/query-helper.js diff --git a/src/__tests__/query-helper.js b/src/__tests__/query-helper.js new file mode 100644 index 00000000..7e53ab03 --- /dev/null +++ b/src/__tests__/query-helper.js @@ -0,0 +1,18 @@ +import * as queryHelpers from '../query-helpers' +import {configure, getConfig} from '../config' + +const originalConfig = getConfig() +beforeEach(() => { + configure(originalConfig) +}) + +test('should delegate to config.getElementError', () => { + const getElementError = jest.fn() + configure({getElementError}) + + const message = 'test Message' + const container = {} // dummy + + queryHelpers.getElementError(message, container) + expect(getElementError.mock.calls[0]).toEqual([message, container]) +}) From 7fe836d652b240dc60f7a1d914fb3370eec52fa2 Mon Sep 17 00:00:00 2001 From: "Kent C. Dodds" Date: Mon, 30 Mar 2020 09:31:03 -0600 Subject: [PATCH 3/3] Update src/query-helpers.js --- src/query-helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/query-helpers.js b/src/query-helpers.js index dc81a1fd..7fcc6bd9 100644 --- a/src/query-helpers.js +++ b/src/query-helpers.js @@ -7,7 +7,7 @@ function getElementError(message, container) { } function getMultipleElementsFoundError(message, container) { - return getConfig().getElementError( + return getElementError( `${message}\n\n(If this is intentional, then use the \`*AllBy*\` variant of the query (like \`queryAllByText\`, \`getAllByText\`, or \`findAllByText\`)).`, container, )