Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing utilities cleanup #5514

Merged
merged 13 commits into from
Nov 4, 2019
Merged

Testing utilities cleanup #5514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ba2d996
Relocate mock testing utilities alongside other testing utilities
hwillson Oct 25, 2019
55d4b53
Combine AC and React mock link and subscription testing utils
hwillson Oct 25, 2019
d40ed8a
Move testing utilities to `src/utilities/testing`
hwillson Oct 25, 2019
830b886
Move mock client testing utilities into common testing location
hwillson Oct 25, 2019
21411d4
Remove the `wait` testing utility
hwillson Oct 25, 2019
db2892f
Move `MockedProvider` into new common testing utility location
hwillson Oct 25, 2019
8be01f7
Rename the `mocks` utility folder to `mocking`
hwillson Oct 25, 2019
7090c8c
Build testing bundle from new utilities location
hwillson Oct 28, 2019
2839b13
Use ApolloLink#setOnError to set rejection function.
benjamn Nov 4, 2019
83b9395
Codemod to refactor makeSingleLink rejection handling.
benjamn Nov 4, 2019
e231d8c
Fix some TypeScript variable redeclaration errors in test files.
benjamn Nov 4, 2019
de47804
Refactor mockSingleLink rejection handling to use setOnError method.
benjamn Nov 4, 2019
5730146
Use ApolloLink#setOnError in stray .test.tsx file.
benjamn Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions config/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ module.exports = {
testURL: 'http://localhost',
testPathIgnorePatterns: [
'/node_modules/',
'/dist/',
'src/__tests__/utils'
'/dist/'
],
modulePathIgnorePatterns: ['/dist/'],
setupFiles: ['<rootDir>/src/config/jest/setup.ts'],
Expand Down
10 changes: 5 additions & 5 deletions config/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ function prepareCJSMinified() {
// context.
function prepareTesting() {
const bundleName = 'testing';
const apolloProviderPath = 'context/ApolloProvider';
const apolloProviderPath = 'react/context/ApolloProvider';

const testingGlobals = {
...globals,
[`../../${apolloProviderPath}`]: 'ApolloProvider'
[`../../../${apolloProviderPath}`]: 'ApolloProvider'
};

const output = {
Expand All @@ -140,11 +140,11 @@ function prepareTesting() {
// `react/testing` type definitions.
fs.writeFileSync(
`${distDir}/${bundleName}.d.ts`,
"export * from './react/testing';"
"export * from './utilities/testing';"
);

return {
input: `${distDir}/react/testing/index.js`,
input: `${distDir}/utilities/testing/index.js`,
external: (id) => hasOwn.call(testingGlobals, id),
output,
plugins: [
Expand All @@ -162,7 +162,7 @@ function prepareTesting() {
generateBundle(_option, bundle) {
bundle[bundleJs].code =
bundle[bundleJs].code.replace(
`../${apolloProviderPath}`,
`../../${apolloProviderPath}`,
packageJson.main.replace(distDir, '.')
);
}
Expand Down
167 changes: 0 additions & 167 deletions src/__mocks__/mockLinks.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/__tests__/ApolloClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { makeReference } from '../utilities/graphql/storeUtils';
import { ApolloLink } from '../link/core/ApolloLink';
import { HttpLink } from '../link/http/HttpLink';
import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
import { stripSymbols } from './utils/stripSymbols';
import { withWarning } from './utils/wrap';
import { stripSymbols } from '../utilities/testing/stripSymbols';
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@benjamn Just calling this out; I consolidated the testing utilities under a new location of utilities/testing. The previous __tests__/utils location worked, but I didn’t like how our rollup config looked when creating a separate testing bundle from the __tests__ dir. Let me know if the new location works - thanks!

import { withWarning } from '../utilities/testing/wrap';
import { ApolloClient } from '../';
import { DefaultOptions } from '../ApolloClient';
import { FetchPolicy, QueryOptions } from '../core/watchQueryOptions';
Expand Down
Loading