-
-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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.
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
[RFR] Upgrade material-ui to 4.2.1 #3457
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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 |
|---|---|---|
| @@ -1,57 +1,58 @@ | ||
| import assert from 'assert'; | ||
| import { shallow } from 'enzyme'; | ||
| import { render, cleanup } from 'react-testing-library'; | ||
| import React from 'react'; | ||
| import { renderWithRedux } from 'ra-core'; | ||
|
|
||
| import { SimpleForm } from './SimpleForm'; | ||
| import SimpleForm, { SimpleForm as SimpleFormView } from './SimpleForm'; | ||
| import TextInput from '../input/TextInput'; | ||
|
|
||
| describe('<SimpleForm />', () => { | ||
| afterEach(cleanup); | ||
|
|
||
| it('should embed a form with given component children', () => { | ||
| const wrapper = shallow( | ||
| const { queryByLabelText } = renderWithRedux( | ||
| <SimpleForm> | ||
| <TextInput source="name" /> | ||
| <TextInput source="city" /> | ||
| </SimpleForm> | ||
| ); | ||
| const inputs = wrapper.find('WithStyles(FormInput)'); | ||
| assert.deepEqual(inputs.map(i => i.prop('input').props.source), [ | ||
| 'name', | ||
| 'city', | ||
| ]); | ||
|
|
||
| expect(queryByLabelText('Name')).not.toBeNull(); | ||
| expect(queryByLabelText('City')).not.toBeNull(); | ||
| }); | ||
|
|
||
| it('should display <Toolbar />', () => { | ||
| const wrapper = shallow( | ||
| <SimpleForm> | ||
| <TextInput source="name" /> | ||
| </SimpleForm> | ||
| ); | ||
| const button = wrapper.find( | ||
| 'WithTheme(WithWidth(WithStyles(Toolbar)))' | ||
| const Toolbar = () => <p>TOOLBAR</p>; | ||
|
|
||
| const { queryByText } = render( | ||
| <SimpleFormView toolbar={<Toolbar />} /> | ||
| ); | ||
| assert.equal(button.length, 1); | ||
| expect(queryByText('TOOLBAR')).not.toBeNull(); | ||
| }); | ||
|
|
||
| it('should pass submitOnEnter to <Toolbar />', () => { | ||
| const handleSubmit = () => {}; | ||
| const wrapper1 = shallow( | ||
| <SimpleForm submitOnEnter={false} handleSubmit={handleSubmit}> | ||
| <TextInput source="name" /> | ||
| </SimpleForm> | ||
| ); | ||
| const button1 = wrapper1.find( | ||
| 'WithTheme(WithWidth(WithStyles(Toolbar)))' | ||
| const Toolbar = ({ submitOnEnter }) => ( | ||
| <p>submitOnEnter: {submitOnEnter.toString()}</p> | ||
| ); | ||
| assert.equal(button1.prop('submitOnEnter'), false); | ||
|
|
||
| const wrapper2 = shallow( | ||
| <SimpleForm submitOnEnter={true} handleSubmit={handleSubmit}> | ||
| <TextInput source="name" /> | ||
| </SimpleForm> | ||
| const { queryByText, rerender } = render( | ||
| <SimpleFormView | ||
| submitOnEnter={false} | ||
| handleSubmit={handleSubmit} | ||
| toolbar={<Toolbar />} | ||
| /> | ||
| ); | ||
| const button2 = wrapper2.find( | ||
| 'WithTheme(WithWidth(WithStyles(Toolbar)))' | ||
|
|
||
| expect(queryByText('submitOnEnter: false')).not.toBeNull(); | ||
|
|
||
| rerender( | ||
| <SimpleFormView | ||
| submitOnEnter | ||
| handleSubmit={handleSubmit} | ||
| toolbar={<Toolbar />} | ||
| /> | ||
| ); | ||
| assert.equal(button2.prop('submitOnEnter'), true); | ||
|
|
||
| expect(queryByText('submitOnEnter: true')).not.toBeNull(); | ||
| }); | ||
| }); |
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
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
Oops, something went wrong.
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.
Sorry for resurrecting an old PR. I think this change may have not been intentional.
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.
Good catch! I opened a PR to fix that #3498