Skip to content

Commit f6df18b

Browse files
authored
Merge pull request #1012 from reduxjs/feature/rtk-query-tests
2 parents b7d27a6 + 8157b3e commit f6df18b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+6214
-4471
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
node_modules
44
# Dist and query are both build output folders
55
dist
6-
query
6+
!query/
7+
# But don't ignore the RTK Query source
8+
!src/query/
79
lib
810
es
911
yarn.lock

api-extractor.query-react.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*
4646
* SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
4747
*/
48-
"mainEntryPointFilePath": "dist/query/react.d.ts",
48+
"mainEntryPointFilePath": "dist/query/react/index.d.ts",
4949
//"mainEntryPointFilePath": "/home/weber/tmp/rtk-origin-master/dist/index.d.ts",
5050

5151
/**

jest.config.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
module.exports = {
22
setupFilesAfterEnv: ['./jest.setup.js'],
3-
testPathIgnorePatterns: ['<rootDir>/query/*'],
3+
testPathIgnorePatterns: ['<rootDir>/query-old/*'],
4+
moduleNameMapper: {
5+
'^@reduxjs/toolkit$': '<rootDir>/src/index.ts',
6+
'^@reduxjs/toolkit/query$': '<rootDir>/src/query/index.ts',
7+
'^@reduxjs/toolkit/query/react$': '<rootDir>/src/query/react/index.ts',
8+
'^@internal/(.*)$': '<rootDir>/src/query/*',
9+
},
10+
globals: {
11+
'ts-jest': {
12+
tsconfig: 'tsconfig.test.json',
13+
},
14+
},
415
}

jest.setup.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
process.on('unhandledRejection', error => {
1+
//@ts-ignore
2+
const nodeFetch = require('node-fetch')
3+
//@ts-ignore
4+
global.fetch = nodeFetch
5+
//@ts-ignore
6+
global.Request = nodeFetch.Request
7+
const { server } = require('./src/query/tests/mocks/server')
8+
9+
beforeAll(() => server.listen({ onUnhandledRequest: 'error' }))
10+
afterEach(() => server.resetHandlers())
11+
afterAll(() => server.close())
12+
13+
process.on('unhandledRejection', (error) => {
214
// eslint-disable-next-line no-undef
315
fail(error)
416
})

0 commit comments

Comments
 (0)