Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

Included tests by adding .test extension #1448

Merged
merged 5 commits into from
Dec 24, 2017
Merged

Included tests by adding .test extension #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c054fe
Updated the name of Query test
excitement-engineer Dec 23, 2017
ecb5b63
Fixed broken tests
excitement-engineer Dec 23, 2017
9bdcb5c
Merge branch 'master' of https://github.com/apollographql/react-apoll…
excitement-engineer Dec 23, 2017
24596ca
Merge branch 'master' into fix-jest-test-query
rosskevin Dec 23, 2017
d54c124
Fixed broken tests
excitement-engineer Dec 24, 2017
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
99 changes: 41 additions & 58 deletions test/react-web/client/Query.js → test/react-web/client/Query.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ const mocks = [
},
];

const options = {
query,
};

const catchAsyncError = (done, cb) => {
try {
cb();
Expand All @@ -38,17 +34,6 @@ const catchAsyncError = (done, cb) => {
}
};

class ErrorBoundary extends React.Component {
componentDidCatch(error, errorInfo) {
console.log(error);
console.log(errorInfo);
}

render() {
return this.props.children;
}
}

describe('Query component', () => {
it('calls the children prop', done => {
const Component = () => (
Expand Down Expand Up @@ -352,17 +337,17 @@ describe('Query component', () => {
if (count === 1) {
// first data
expect(variables).toEqual({ first: 1 });
expect(data).toEqual(data1);
expect(data).toMatchSnapshot('refetch prop: first render data');
}
if (count === 3) {
// second data
expect(variables).toEqual({ first: 1 });
expect(data).toEqual(data2);
expect(data).toMatchSnapshot('refetch prop: second render data');
}
if (count === 5) {
// third data
expect(variables).toEqual({ first: 2 });
expect(data).toEqual(data3);
expect(data).toMatchSnapshot('refetch prop: third render data');
}
});

Expand All @@ -376,11 +361,15 @@ describe('Query component', () => {
result
.refetch()
.then(result1 => {
expect(result1.data).toEqual(data2);
expect(result1.data).toMatchSnapshot(
'refetch prop: result refetch call 1',
);
return result.refetch({ first: 2 });
})
.then(result2 => {
expect(result2.data).toEqual(data3);
expect(result2.data).toMatchSnapshot(
'refetch prop: result refetch call 2',
);
done();
})
.catch(done.fail);
Expand Down Expand Up @@ -440,21 +429,18 @@ describe('Query component', () => {
}),
})
.then(result => {
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot(
'fetchMore render prop: result fetchMore call',
);
})
.catch(done.fail);
} else if (count === 1) {
catchAsyncError(done, () => {
expect(data.variables).toEqual(variables);
expect(data.data).toMatchSnapshot(
'fetchMore render prop: render data',
);

expect(data.data).toEqual({
allPeople: {
people: [
...data1.allPeople.people,
...data2.allPeople.people,
],
},
});
done();
});
}
Expand Down Expand Up @@ -484,11 +470,11 @@ describe('Query component', () => {
return null;
}
if (count === 0) {
expect(result.data).toEqual(data1);
expect(result.data).toMatchSnapshot();
} else if (count === 1) {
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot();
} else if (count === 2) {
expect(result.data).toEqual(data3);
expect(result.data).toMatchSnapshot();
}
count++;
return null;
Expand Down Expand Up @@ -547,11 +533,11 @@ describe('Query component', () => {
}
catchAsyncError(done, () => {
if (count === 0) {
expect(result.data).toEqual(data1);
expect(result.data).toMatchSnapshot();
} else if (count === 1) {
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot();
} else if (count === 2) {
expect(result.data).toEqual(data3);
expect(result.data).toMatchSnapshot();
}
});

Expand Down Expand Up @@ -607,9 +593,9 @@ describe('Query component', () => {
return null;
}
if (count === 0) {
expect(result.data).toEqual(data1);
expect(result.data).toMatchSnapshot();
} else if (count === 1) {
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot();
result.stopPolling();
}
count++;
Expand Down Expand Up @@ -675,7 +661,9 @@ describe('Query component', () => {
}
if (isUpdated) {
catchAsyncError(done, () => {
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot(
'updateQuery render prop: rendered data',
);
done();
});

Expand All @@ -685,7 +673,9 @@ describe('Query component', () => {
setTimeout(() => {
result.updateQuery((prev, { variables: variablesUpdate }) => {
catchAsyncError(done, () => {
expect(prev).toEqual(data1);
expect(prev).toMatchSnapshot(
'updateQuery render prop: result of the updateQuery call',
);
expect(variablesUpdate).toEqual({ first: 2 });
});

Expand Down Expand Up @@ -760,11 +750,11 @@ describe('Query component', () => {
catchAsyncError(done, () => {
if (count === 0) {
expect(result.variables).toEqual({ first: 1 });
expect(result.data).toEqual(data1);
expect(result.data).toMatchSnapshot();
}
if (count === 1) {
expect(result.variables).toEqual({ first: 2 });
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot();
done();
}
});
Expand Down Expand Up @@ -818,14 +808,6 @@ describe('Query component', () => {
query: query1,
};

componentDidMount() {
setTimeout(() => {
this.setState({
query: query2,
});
}, 50);
}

render() {
const { query } = this.state;

Expand All @@ -837,10 +819,15 @@ describe('Query component', () => {
}
catchAsyncError(done, () => {
if (count === 0) {
expect(result.data).toEqual(data1);
expect(result.data).toMatchSnapshot();
setTimeout(() => {
this.setState({
query: query2,
});
});
}
if (count === 1) {
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot();
done();
}
});
Expand Down Expand Up @@ -952,15 +939,15 @@ describe('Query component', () => {
}
catchAsyncError(done, () => {
if (count === 0) {
expect(result.data).toEqual(data1);
expect(result.data).toMatchSnapshot();
setTimeout(() => {
this.setState({
client: client2,
});
}, 0);
}
if (count === 1) {
expect(result.data).toEqual(data2);
expect(result.data).toMatchSnapshot();
done();
}
count++;
Expand All @@ -974,10 +961,6 @@ describe('Query component', () => {
}
}

const wrapper = mount(
<ErrorBoundary>
<Component />
</ErrorBoundary>,
);
const wrapper = mount(<Component />);
});
});
42 changes: 0 additions & 42 deletions test/react-web/client/__snapshots__/Query.js.snap
View file
Open in desktop

This file was deleted.

Loading