This repository has been archived by the owner on Apr 13, 2023. It is now read-only.
Fix crash in unsubscribeFromQuery #260
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -370,6 +370,43 @@ describe('queries', () => { | |
| }, 25); | ||
| }); | ||
|
|
||
| it('continues to not subscribe to a skipped query when props change', (done) => { | ||
| const query = gql`query people { allPeople(first: 1) { people { name } } }`; | ||
| const networkInterface = mockNetworkInterface(); | ||
| const oldQuery = networkInterface.query; | ||
|
|
||
| networkInterface.query = function (request) { | ||
| fail(new Error('query ran even though skip present')); | ||
| return oldQuery.call(this, request); | ||
| }; | ||
| const client = new ApolloClient({ networkInterface }); | ||
|
|
||
| @graphql(query, { skip: true }) | ||
| class Container extends React.Component<any, any> {8 | ||
| componentWillReceiveProps(props) { | ||
| done(); | ||
| } | ||
| render() { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| class Parent extends React.Component<any, any> { | ||
| constructor() { | ||
| super(); | ||
| this.state = { foo: 42 }; | ||
| } | ||
| componentDidMount() { | ||
| this.setState({ foo: 43 }); | ||
| } | ||
| render() { | ||
| return <Container foo={this.state.foo} />; | ||
| } | ||
| }; | ||
|
|
||
| renderer.create(<ProviderMock client={client}><Parent /></ProviderMock>); | ||
| }); | ||
|
|
||
| it('doesn\'t run options or props when skipped', (done) => { | ||
| const query = gql`query people { allPeople(first: 1) { people { name } } }`; | ||
| const data = { allPeople: { people: [ { name: 'Luke Skywalker' } ] } }; | ||
|
|
@@ -426,6 +463,106 @@ describe('queries', () => { | |
| }, 25); | ||
| }); | ||
|
|
||
| // test the case of skip:false -> skip:true -> skip:false to make sure things | ||
| // are cleaned up properly | ||
| it('allows you to skip then unskip a query with top-level syntax', (done) => { | ||
| const query = gql`query people { allPeople(first: 1) { people { name } } }`; | ||
| const data = { allPeople: { people: [ { name: 'Luke Skywalker' } ] } }; | ||
| const networkInterface = mockNetworkInterface({ request: { query }, result: { data } }); | ||
| const client = new ApolloClient({ networkInterface }); | ||
|
|
||
| let hasSkipped = false; | ||
| @graphql(query, { skip: ({ skip }) => skip }) | ||
| class Container extends React.Component<any, any> {8 | ||
| componentWillReceiveProps(newProps) { | ||
| if (newProps.skip) { | ||
| hasSkipped = true; | ||
| this.props.setSkip(false); | ||
| } else { | ||
| if (hasSkipped) { | ||
| done(); | ||
| } else { | ||
| this.props.setSkip(true); | ||
| } | ||
| } | ||
| } | ||
| render() { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| class Parent extends React.Component<any, any> { | ||
| constructor() { | ||
| super(); | ||
| this.state = { skip: false }; | ||
| } | ||
| render() { | ||
| return <Container skip={this.state.skip} setSkip={(skip) => this.setState({ skip })} />; | ||
| } | ||
| }; | ||
|
|
||
| renderer.create(<ProviderMock client={client}><Parent /></ProviderMock>); | ||
| }); | ||
|
|
||
| it('allows you to skip then unskip a query with opts syntax', (done) => { | ||
|
There was a problem hiding this comment. This one wasn't actually failing (without the code change). Or maybe it was failing if you only reverted one bit of the code change but not the whole commit. I've made it longer and more detailed, but then it doesn't actually pass any more: looks like I can't convince it to run the query again. Maybe that's due to some caching and that's a feature? I guess @tmeasday is asleep now; @jbaxleyiii want to take a look at my version of this test and help me figure out how to get it to fail? The goal is to trigger a now-fixed bug where the check on |
||
| const query = gql`query people { allPeople(first: 1) { people { name } } }`; | ||
| const data = { allPeople: { people: [ { name: 'Luke Skywalker' } ] } }; | ||
| const nextData = { allPeople: { people: [ { name: 'Anakin Skywalker' } ] } }; | ||
| const networkInterface = mockNetworkInterface({ | ||
| request: { query }, result: { data }, newData: () => ({ data: nextData }) }); | ||
| const oldQuery = networkInterface.query; | ||
|
|
||
| let ranQuery = 0; | ||
| networkInterface.query = function (request) { | ||
| ranQuery++; | ||
| return oldQuery.call(this, request); | ||
| }; | ||
| const client = new ApolloClient({ networkInterface }); | ||
|
|
||
| let hasSkipped = false; | ||
| let hasRequeried = false; | ||
| @graphql(query, { options: ({ skip }) => ({ skip, forceFetch: true }) }) | ||
| class Container extends React.Component<any, any> {8 | ||
| componentWillReceiveProps(newProps) { | ||
| if (newProps.skip) { | ||
| // Step 2. We shouldn't query again. | ||
| expect(ranQuery).toBe(1); | ||
| hasSkipped = true; | ||
| this.props.setSkip(false); | ||
| } else if (hasRequeried) { | ||
| // Step 4. We need to actually get the data from the query into the component! | ||
| expect(newProps.data.loading).toBe(false); | ||
| done(); | ||
| } else if (hasSkipped) { | ||
| // Step 3. We need to query again! | ||
| expect(newProps.data.loading).toBe(true); | ||
| expect(ranQuery).toBe(2); | ||
| hasRequeried = true; | ||
| } else { | ||
| // Step 1. We've queried once. | ||
| expect(ranQuery).toBe(1); | ||
| this.props.setSkip(true); | ||
| } | ||
| } | ||
| render() { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| class Parent extends React.Component<any, any> { | ||
| constructor() { | ||
| super(); | ||
| this.state = { skip: false }; | ||
| } | ||
| render() { | ||
| return <Container skip={this.state.skip} setSkip={(skip) => this.setState({ skip })} />; | ||
| } | ||
| }; | ||
|
|
||
| renderer.create(<ProviderMock client={client}><Parent /></ProviderMock>); | ||
| }); | ||
|
|
||
|
|
||
| it('removes the injected props if skip becomes true', (done) => { | ||
| let count = 0; | ||
| const query = gql` | ||
|
|
@@ -495,6 +632,44 @@ describe('queries', () => { | |
| renderer.create(<ProviderMock client={client}><ChangingProps /></ProviderMock>); | ||
| }); | ||
|
|
||
|
|
||
| it('allows you to unmount a skipped query', (done) => { | ||
| const query = gql`query people { allPeople(first: 1) { people { name } } }`; | ||
| const networkInterface = mockNetworkInterface(); | ||
| const client = new ApolloClient({ networkInterface }); | ||
|
|
||
| @graphql(query, { | ||
| skip: true, | ||
| }) | ||
| class Container extends React.Component<any, any> { | ||
| componentDidMount() { | ||
| this.props.hide(); | ||
| } | ||
| componentWillUnmount() { | ||
| done(); | ||
| } | ||
| render() { | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| class Hider extends React.Component<any, any> { | ||
| constructor() { | ||
| super(); | ||
| this.state = { hide: false }; | ||
| } | ||
| render() { | ||
| if (this.state.hide) { | ||
| return null; | ||
| } | ||
| return <Container hide={() => this.setState({ hide: true })} />; | ||
| } | ||
| } | ||
|
|
||
| renderer.create(<ProviderMock client={client}><Hider /></ProviderMock>); | ||
| }); | ||
|
|
||
|
|
||
| it('reruns the query if it changes', (done) => { | ||
| let count = 0; | ||
| const query = gql` | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't figure out what
failis. It's not in https://facebook.github.io/jest/docs/api.html or defined in the file. But it does seem to work (I tested with the change reverted...)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess
failis a Jasmine thing. Jest's docs seem a bit incomplete.