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.

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

[enzyme-adapter-react-16] [New] mount: add hydrateIn option #1707

Merged
merged 1 commit into from
Jul 7, 2018
Merged

Conversation

ljharb
Copy link
Member

@ljharb ljharb commented Jul 6, 2018

Fixes #1316

Reviewers: please help ensure that the following scenarios will work after this PR:

  • new enzyme + new adapter
  • new enzyme + old adapter
  • old enzyme + new adapter

Copy link
Contributor

@brucewpaul brucewpaul left a comment

Choose a reason for hiding this comment

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

One question, but either way 👍

@@ -21,9 +21,25 @@ export function getAdapter(options = {}) {
}

export function makeOptions(options) {
const { attachTo, hydrateIn } = options;

if (attachTo && hydrateIn && attachTo !== hydrateIn) {
Copy link
Contributor

Choose a reason for hiding this comment

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

would there ever be a case when both are present? Do we just want to not allow this and then hydrate -> attach on pre16 versions?

Copy link
Member Author

Choose a reason for hiding this comment

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

So, I’ve normalized the options here - which means it will end up having both the best time it hits this code path. So altho users really shouldn’t supply both, i cant think of how to differentiate between user options and things passed in via shallow calls or adapter options etc.

@ljharb ljharb merged commit ee180af into master Jul 7, 2018
@ljharb ljharb deleted the hydrate branch July 7, 2018 15:56
ljharb added a commit that referenced this pull request Aug 8, 2018
 - [new] add `isFragment` (#1733)
 - [new] Add `displayNameOfNode`, `isValidElementType`
 - [new] `mount`: add `hydrateIn` option (#1317, #1707)
 - [new] Add support for react context element types (#1513)
 - [new] `shallow`: Add getSnapshotBeforeUpdate support (#1657)
 - [fix] portals and roots may render fragments (#1733)
 - [fix] add missing support for animation events (#1569)
 - [fix] `shallow`: SFCs do not get a `this` (#1703)
 - [refactor]: add “lifecycles” adapter option (#1696)
 - [fix] call ref for a root element (#1541)
 - [fix] Allow empty strings as key props (#1524)
 - [fix] Fix ShallowWrapper for array-rendering components (#1498)
 - [refactor] use `react-is` package
 - [meta] ensure a license and readme is present in all packages when published
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants