Cleaning up uses of StaticQuery
This commit is contained in:
parent
8426eaa433
commit
02f6f2d252
@ -4,13 +4,7 @@ exports[`Footer rendering 1`] = `
|
|||||||
ShallowWrapper {
|
ShallowWrapper {
|
||||||
Symbol(enzyme.__root__): [Circular],
|
Symbol(enzyme.__root__): [Circular],
|
||||||
Symbol(enzyme.__unrendered__): <Footer
|
Symbol(enzyme.__unrendered__): <Footer
|
||||||
site={
|
buildId="abc-123"
|
||||||
Object {
|
|
||||||
"siteMetadata": Object {
|
|
||||||
"buildId": "abc-123",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
t={[Function]}
|
t={[Function]}
|
||||||
/>,
|
/>,
|
||||||
Symbol(enzyme.__renderer__): Object {
|
Symbol(enzyme.__renderer__): Object {
|
||||||
|
@ -15,7 +15,7 @@ const query = graphql`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const Footer = ({ t, site: { siteMetadata } }) => (
|
export const Footer = ({ t, buildId }) => (
|
||||||
<footer className={ style.footer }>
|
<footer className={ style.footer }>
|
||||||
<ul className={ style.list }>
|
<ul className={ style.list }>
|
||||||
<li>
|
<li>
|
||||||
@ -33,22 +33,18 @@ export const Footer = ({ t, site: { siteMetadata } }) => (
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div className={ style.buildId }>
|
<div className={ style.buildId }>
|
||||||
{ siteMetadata.buildId }
|
{ buildId }
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
);
|
);
|
||||||
|
|
||||||
Footer.propTypes = {
|
Footer.propTypes = {
|
||||||
t: PropTypes.func.isRequired,
|
t: PropTypes.func.isRequired,
|
||||||
site: PropTypes.shape({
|
buildId: PropTypes.string.isRequired
|
||||||
siteMetadata: PropTypes.shape({
|
|
||||||
buildId: PropTypes.string.isRequired
|
|
||||||
}).isRequired
|
|
||||||
}).isRequired
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default withNamespaces()(props => (
|
export default withNamespaces()(props => (
|
||||||
<StaticQuery query={ query } render={ data => (
|
<StaticQuery query={ query } render={ ({ site: { siteMetadata } }) => (
|
||||||
<Footer { ...props } { ...data } />
|
<Footer { ...props } { ...siteMetadata } />
|
||||||
) } />
|
) } />
|
||||||
));
|
));
|
||||||
|
@ -7,7 +7,7 @@ import { Footer } from 'components/Footer';
|
|||||||
describe('Footer', () => {
|
describe('Footer', () => {
|
||||||
test('rendering', () => {
|
test('rendering', () => {
|
||||||
const component = shallow(
|
const component = shallow(
|
||||||
<Footer site={{ siteMetadata: { buildId: 'abc-123' } }} t={ mockT } />
|
<Footer buildId="abc-123" t={ mockT } />
|
||||||
);
|
);
|
||||||
expect(component).toMatchSnapshot();
|
expect(component).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
@ -4,13 +4,7 @@ exports[`Header rendering 1`] = `
|
|||||||
ShallowWrapper {
|
ShallowWrapper {
|
||||||
Symbol(enzyme.__root__): [Circular],
|
Symbol(enzyme.__root__): [Circular],
|
||||||
Symbol(enzyme.__unrendered__): <Header
|
Symbol(enzyme.__unrendered__): <Header
|
||||||
site={
|
banner="testing"
|
||||||
Object {
|
|
||||||
"siteMetadata": Object {
|
|
||||||
"banner": "testing",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/>,
|
/>,
|
||||||
Symbol(enzyme.__renderer__): Object {
|
Symbol(enzyme.__renderer__): Object {
|
||||||
"batchedUpdates": [Function],
|
"batchedUpdates": [Function],
|
||||||
@ -540,13 +534,7 @@ exports[`Header rendering with no banner 1`] = `
|
|||||||
ShallowWrapper {
|
ShallowWrapper {
|
||||||
Symbol(enzyme.__root__): [Circular],
|
Symbol(enzyme.__root__): [Circular],
|
||||||
Symbol(enzyme.__unrendered__): <Header
|
Symbol(enzyme.__unrendered__): <Header
|
||||||
site={
|
banner={false}
|
||||||
Object {
|
|
||||||
"siteMetadata": Object {
|
|
||||||
"banner": false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/>,
|
/>,
|
||||||
Symbol(enzyme.__renderer__): Object {
|
Symbol(enzyme.__renderer__): Object {
|
||||||
"batchedUpdates": [Function],
|
"batchedUpdates": [Function],
|
||||||
|
@ -19,10 +19,10 @@ const query = graphql`
|
|||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const Header = ({ site: { siteMetadata } }) => (
|
export const Header = ({ banner }) => (
|
||||||
<header
|
<header
|
||||||
className={ style.header }
|
className={ style.header }
|
||||||
data-banner={ siteMetadata.banner || null }>
|
data-banner={ banner || null }>
|
||||||
<h1>
|
<h1>
|
||||||
<Link to="/">Regexper</Link>
|
<Link to="/">Regexper</Link>
|
||||||
</h1>
|
</h1>
|
||||||
@ -49,18 +49,14 @@ export const Header = ({ site: { siteMetadata } }) => (
|
|||||||
);
|
);
|
||||||
|
|
||||||
Header.propTypes = {
|
Header.propTypes = {
|
||||||
site: PropTypes.shape({
|
banner: PropTypes.oneOfType([
|
||||||
siteMetadata: PropTypes.shape({
|
PropTypes.bool,
|
||||||
banner: PropTypes.oneOfType([
|
PropTypes.string
|
||||||
PropTypes.bool,
|
]).isRequired
|
||||||
PropTypes.string
|
|
||||||
]).isRequired
|
|
||||||
}).isRequired
|
|
||||||
}).isRequired
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default withNamespaces()(props => (
|
export default withNamespaces()(props => (
|
||||||
<StaticQuery query={ query } render={ data => (
|
<StaticQuery query={ query } render={ ({ site: { siteMetadata } }) => (
|
||||||
<Header { ...props } { ...data } />
|
<Header { ...props } { ...siteMetadata } />
|
||||||
) } />
|
) } />
|
||||||
));
|
));
|
||||||
|
@ -6,14 +6,14 @@ import { Header } from 'components/Header';
|
|||||||
describe('Header', () => {
|
describe('Header', () => {
|
||||||
test('rendering', () => {
|
test('rendering', () => {
|
||||||
const component = shallow(
|
const component = shallow(
|
||||||
<Header site={{ siteMetadata: { banner: 'testing' } }} />
|
<Header banner="testing" />
|
||||||
);
|
);
|
||||||
expect(component).toMatchSnapshot();
|
expect(component).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
|
||||||
test('rendering with no banner', () => {
|
test('rendering with no banner', () => {
|
||||||
const component = shallow(
|
const component = shallow(
|
||||||
<Header site={{ siteMetadata: { banner: false } }} />
|
<Header banner={ false } />
|
||||||
);
|
);
|
||||||
expect(component).toMatchSnapshot();
|
expect(component).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user